Test Django 1.7
Remove simplejson
Fix tox
Remove bson support. Nobody uses it.
Fix tests for Django 1.7
Merge branch 'feature/django1.7' into develop
Fix tox
Update version
Merge branch 'release/3.3.0' into develop