Fixes for django 1.6

Thanks for toxifying this project. Unfortunately your `*-django16-*` tox environments were ending up with Django 1.5 installed so I've fixed that and the bugs it revealed.