Updated tests and fixed gh-29
Merge branch 'master' of github.com:armet/django-armet