Fixing formatting, parameterising literals as class or module vars, cleaning up unused imports
Merge branch 'develop' of github.com:philipkershaw/djcharme into philipkershaw-develop

Conflicts:
	djcharme/djcharme/charme_middleware.py
	djcharme/djcharme/security_middleware.py