migrate to gulp 3.7.0 for node-liftoff support
Merge remote-tracking branch 'seed/gh-pages' into gh-pages

Conflicts:
	package.json