Upgraded for Django 1.5+

Many updates.