Cleanup some of the recent changes while tracking bugs and try the new browserify 3.1.0