Remove settings.py content
Removed try execpt from settings.py
Merged local_settings.py with settings.py
Added oq_secret_key generator in deploy.sh
Added oq_secret_key to the template
Added oq_secret_key generator in fabfile.py
Added a comment to a temporary setting
Fixes a typo in deploy.sh
Enables site lockdown (LOCKDOWN_GEONODE = True)
csrf middleware needs to be turned off for icebox
Merge branch 'master' into settings-refactoring

Conflicts:
	openquakeplatform/fabfile.py
Small fixes to fabfile.py
Changed random key algorith to avoid issues with quotes
Added full path to the local_settings import
Merge pull request #158 from gem/settings-refactoring

Settings refactoring