Migrate to Django 1.7.
Merge master.
Merge pull request #112 from bigkevmcd/upgrade-to17

Migrate to Django 1.7.