Update the gulpfile to be a little more intuitive.  Also fixing #16