Added deployment related stuff
Merge branch 'develop'
Merge branch 'develop'
reran migration
Merge branch 'develop' into feature/deployment

Conflicts:
	README.md
	requirements/base.txt
removed gunciorn from global config
Merge branch 'feature/vagrant' into develop
adding a robots.txt
allowing robots for now
Merge branch 'develop' into feature/deployment
Merge branch 'feature/deployment' into develop
Merge branch 'master' into develop

Conflicts:
	settings/base.py
fixing bugs on staging site
fixing email backend
Adding site awareness to activation email
Making error reports more pretty
fixed a typo
making credential error show up sooner
commiting to raising exceptions sooner
removed old comment