use node_modules browserify in Makefile
Merge pull request #144 from mapbox/browserify-make

use node_modules browserify in Makefile
fixing merge conflict