able to generate random email
Merge branch 'master' of github.com:jtrope89/shem

Conflicts:
	base.pyc
	internet.py
	name.pyc