update gulpfile
fix index.js
Merge branch 'master' of github.com:tonifisler/generator-styleguide

Conflicts:
	app/templates/gulpfile.js