Bit of cleanup and initial gulp build support.