Port to Django 1.6

These are the last few changes needed for Django 1.6 compatibility.
PRs for dependencies:
jbalogh/test-utils#25
mozilla/nuggets#4