Changes for Django 1.6
Do logging properly
Move to new models and streamline router
New code for new models
Clean up settings, minor typos
Merge new models code