Remove branded image
Add template tags to settings.py.default
Enable the branding by default
Merge pull request #12 from chb/dev

Merge in Dev