Merge pull request #50 from pretenders/dev_alex

Fix for py3
Add ability to use named servers.
Merge branch 'develop' of git+ssh://github.com/pretenders/pretenders into dev_alex_named_servers
Fix tests. Add handling of no smtp history.
Add logging.
Change to just return the named instance. Add some docs.
Remove whitespace changes.
More whitespace retraction
Bump version for alpha testing.
Add argparse as a requirement.
Turns out this is the only change needed for Python2 + 3 compatibility
Merge pull request #55 from pretenders/dev_alex_named_servers

Dev alex named servers
Increased version number
Add ignores
Bumped version number to hello
Merge branch 'master' of git+ssh://github.com/pretenders/pretenders into dev_alex_restructure_merge

Conflicts:
	pretenders/mocks/http/handler.py
	pretenders/server/apps/replay.py
	pretenders/server/tests/integration/test_maintenance.py