Merge pull request #14 from TyMaszWeb/master

Add django-jsonfield as a requirement
Merge pull request #15 from TyMaszWeb/minor-fixes

Minor fixes
[Fixes #13] Make test suite compatible with Django 1.6