Base Django 1.6
Merge branch 'master' of https://github.com/flipjack/django