Move to gulp compiling; clean up a bit