Make production settings more generic
Merge branch 'production-settings'

Conflicts:
	ossus/settings/production.py