Windows support for gulp script, and some cleanup