first commit of new django 1.7 template
Merge branch 'dj17' of https://github.com/darthryking/djangotemplate into dj17