Clean up gulpfile some more

Mostly as a reaction to Twitter code reviews: https://twitter.com/domenic/status/545003771760107520

Kudos especially to @insin whose comments were the most helpful. Not only did they clean up the watchify/browserify split, but they also prompted me to look in to properly returning from my tasks so that gulp can now tell how long they take.