Clean up settings file.
Merge branch 'staging' of github.com:visgence/portcullis into kendoui

Conflicts:
	settings.py
Merge branch 'kendoui' of github.com:visgence/portcullis into slickgrid