Add gulp-plumber for handling errors
Merge branch 'develop'