merge
adding in heroku script
change to heroku-staging
Update README.rst
Merge pull request #8 from Lightmatter/registration_cleanup

Registration cleanup
adding in template debug
fix for the post_compile stuff
adding reversion, and bootstrap scss
upgrading jquery
Update README.rst
adding in bootstrap fonts, and cached tempalte loaders
bugfixes
Merge branch 'master' of github.com:Lightmatter/generic-django-conf
fix for adding reversion
copule of fixes
fix for fonts, fix for broken env variable func
Merge branch 'master' into registration_cleanup