making the gulpfile a little leaner
Merge branch 'develop' of github.com:tschwartz/gulp into develop

Conflicts:
	gulpfile.js