Adding gulp-wait plugin
Small updates to clean up Gulp tasks