Upgrade gulp-tasks, make a single page
Merge remote-tracking branch 'origin/master' into gh-pages