Merge pull request #370 from colinwren/master

Added tests for new app generation with handlebars templates
Boilerplate template organization