Merge pull request #1 from ccnmtl/django-1.6.8

Django 1.6.8, South 1.0
Django 1.7.1
Merge branch 'django-1.7' of github.com:ccnmtl/tala into django-1.7