Flushed out routing and ShopView a bit
Merge branch 'master' of https://github.com/alexbestul/galvinator2