Make Django 1.7 happy, actually really easy
Merge pull request #1 from texastribune/1.7

Make Django 1.7 happy, actually really easy