fixing setup
Merge branch 'master' of github.com:ashwoods/django-formulator