refactor gulpfile; tidy up dependencies