Upgrading to django 1.7
Fixing conflicts
Upgrading everything else while i'm at it
Adding new migration
Updating docs to tell users to use migrate rather than syncdb.
Adding django 1.7 upgrade to changelog
Merge pull request #100 from jproffitt/upgrade_django

Upgrade django