rescaffold to fix routing probelms
fix app name typo
Merge branch 'newScaffold' of https://github.com/chrbradley/Durando into chrbradley-newScaffold

in merge conflict hell
Merge branch 'chrbradley-newScaffold'

fix merge conflict