Merge Fork victorette/django-softmachine

Setup update