Fix for Django 1.6  - django.utils.simplejson is deprecated for json
Merge pull request #165 from joshuakarjala/master

Fix for Django 1.6  - django.utils.simplejson is deprecated for json