knocking things around
Merge branch 'develop' into django-1.6-update
updated to work with django 1.6
Merge pull request #11 from jamiecurle/django-1.6-update

Django 1.6 update