Removed some things; added some things.
Merge branch 'master' of github.com:armet/django-armet