json fix
Merge branch 'master' of github.com:jheasly/django_obit_desk2
Ignore fixtures