kraken:controller invokes model, template, and content bundle subgenerators.
kraken:template invokes locale subgenerator.
Merge pull request #68 from mstuart/broken-generators

Controller and template subgenerators will cause an error by default
Merge branch 'master' into refactor

Conflicts:
	controller/index.js
	template/index.js
Merging upstream and removing unneeded page generator