same as jeff, please no conflict
Merge branch 'master' of https://github.com/thecalvinchan/freemail

Conflicts:
	freemail/__init__.pyc
	freemail/settings.py
	freemail/wsgi.py
	freemail/wsgi.pyc
	manage.py
god this is annoying