Update django version
Typo in logger config
Merge branch 'master' into heroku

Conflicts:
	requirements.txt