updated for browserify 6.x and browserify-cache-api 1.x
Merge branch 'master' of github.com:jsdf/browserify-assets

Conflicts:
	package.json