update app versions in requirements
update settings pulling in some of the stuff from https://github.com/bkonkle/cookiecutter-django
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	{{cookiecutter.repo_name}}/requirements/production.txt