Redo gulpfile.
Merge branch 'gulp-redo' into homepage

Conflicts:
	gulpfile.js