update to django 1.7
wsgi stuff
Merge branch 'master' of github.com:deanproxy/deanproxy

Conflicts:
	templates/base/about.html