Got tests running in Django 1.7
Merge branch 'master' of github.com:bradjasper/django-jsonfield
Added fallback for simplejson
Bumped version