making things right after epic fail
Merge branch 'dev' of https://github.com/mwinter80/django-creative into dev
restoring things