Removed trailing whitespace
Pinned to last stable version of Django
Merge branch 'openshift' of https://github.com/emory-libraries/libraryuse into openshift

Conflicts:
	localsettings.py