Updated files so django 1.6.6 works.
Merge pull request #51 from craig8196/dev

Updated files so django 1.6.6 works.