put logging back
Merge remote-tracking branch 'origin/Experiment-with-gulp-type' into Experiment-with-gulp-type