Remove shim, update watchify, fix double resolve
Makefile: simplify
build
2.0.0