misc quotes
fix tests
Merge remote-tracking branch 'github/master'
Merge branch 'master' of github.com:rory/django-template-i18n-lint