Hacking the yeoman layout together
Merge remote-tracking branch 'remotes/origin/yeoman-test'
Somethings left over with the merge