upgrade to django 1.7
Merge branch 'django-1.7'
1.8.0 release
had manifest syntax wrong