Lots of gulp improvements
Merge pull request #1 from jonlong/gulp-improvements

Lots of gulp improvements