Refactoring

Refactored the arg parsing and instance creation internals of Factory as well as Generator._generate_emailfield/_iter_for_choice
This is not valid in Python 2.7.  Please change to be the following:

def _deliver(self, *args, **kwargs):
    save = kwargs.get('save')