Heroku updates
Upgraded to Django 1.7
Fixed broken tests