Merge pull request #26 from ferrix/master

Support newer versions of Django