Fixed recursive watch
Merge branch 'master' of github.com:fixate/generator-fixate-pw

Conflicts:
	app/templates/_Gruntfile.coffee