Django162update

Finished migrating, works pretty well now on Django 1.7