@classmethod<EOL><INDENT>def make_dict(cls, fields, fields_kwargs):<DEDENT>
return utils.make_dict(fields, fields_kwargs)<EOL>
Lots of methods take a dict and key=val for fields, this combines fields
        and fields_kwargs into one master dict, turns out we want to do this more
        than I would've thought to keep api compatibility with prom proper

        :param fields: dict, the fields in a dict
        :param fields_kwargs: dict, if you would like to pass the fields as key=val
            this picks those up and combines them with fields
        :returns: dict, the combined fields