Issues/705 upgrade to django1.6 with new sayit on master

Hopefully this is everything that's needed for us to start using Django 1.6 - hurray!