Updates required to work on Django 1.7

Thanks for the review and merge @davedash :beers: