Merge pull request #15 from relekang/master

Clean up and make django 1.7 compatible
Add customizable branding