ccnmtl/countryx — pull request #4 by thraxil (2014-10-30 11:12:17+00:00)
Title: Django 1.7

Don't merge this PR.

Give me an all clear and then I will merge it.

The Django 1.7 upgrades all hit a snag on the Rolf deploy where the new migrations prompt you to clear out some stale data. Rolf can't really handle that, so I need to go in and redo that step manually on each and then redo the Rolf deploy.