Merge branch 'django1.7'
Merge branch 'master' of github.com:mithegooie/cantina