move django 1.7 requirement out of setup.py and into requirements.txt
Merge branch 'master' of https://github.com/jfmatth/openshift-django17