Merge branch 'master' of github.com:jneight/django-encrypt