fix up gruntfile to reload templates, and remove jshint
remove jshint from package.json
finish first part of ch4"
resolve conflicts
fix conflict