backfilling some changes
Merge branch 'master' of github.com:brack3t/django-braces