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 'develop' into feature/deployment
Merge branch 'feature/deployment' into develop
Merge branch 'master' into develop

Conflicts:
	settings/base.py
fixing bugs on staging site