Disallow Django 1.7 for now
Merge remote-tracking branch 'upstream/master'