more templating
Merge branch 'master' of github.com:crawfordcomeaux/superdash
Merge branch 'master' of github.com:crawfordcomeaux/superdash
blah
Merge branch 'master' of github.com:crawfordcomeaux/superdash
template fix