improve template watch and build logic
Merge branch 'angular' of github.com:leonidas/gulp-project-template into angular
gulp > 3.7 directly supports .coffee
devDependencies version bumps
Merge pull request #4 from cheapsteak/master

Version bumps on devDependencies, removed gulpfile.js
remove tinylr
Merge branch 'master' into angular

Conflicts:
	gulpfile.coffee
	package.json
remove tinylr
Merge branch 'angular' of github.com:leonidas/gulp-project-template into angular
Add tiny-lr to dev dependencies
replace angular template cache with browserify-plain-jade

new 'component style' directory structure
Merge branch 'angular' of github.com:leonidas/gulp-project-template into angular

Conflicts:
	package.json
add initial karma configuration and test spec
Merge branch 'master' of github.com:leonidas/gulp-project-template

Conflicts:
	package.json
don't initialize livereload when NODE_ENV=production
update package.json
Merge branch 'master' into angular

Conflicts:
	gulpfile.coffee
	package.json
typo fix
Merge branch 'master' into angular
Merge branch 'angular' into MEAN

Conflicts:
	gulpfile.coffee
	package.json