specify settings=production in manage.py commands in fabfile
Merge branch 'develop' into feature/offlinecompression

Conflicts:
	django-verdant/fabfile.py
Merge branch 'feature/offlinecompression' into staging