updating settings for heroku test
updating settings for heroku test
updating settings for heroku test
adding dashboard back since things still use it
Moving templatetags back to dashboard
Merge branch 'master' into d3test