Bump django version to 1.6
Merge pull request #212 from stianjensen/django-16

Bump django version to 1.6