Updating for appRewrite
Bit of template cleanup, cinderblock.xml metadata
Merge pull request #1 from andrewfb/appRewrite

App rewrite