Misc fixes

Some fallout from switching to better modules. Also switched to gulp and all kinds of goodness. I think.