refs #12 - Cleaned up from rebase of latest master
refs #12 - Cleaned up from rebase of latest master

caktus/django-scribbler,caktus/django-scribbler,imposeren/django-scribbler,caktus/django-scribbler,imposeren/django-scribbler,imposeren/django-scribbler,caktus/django-scribbler,imposeren/django-scribbler