removing browserify-shim, we don't need it
Merge branch 'master' of https://github.com/JedWatson/react-select

Conflicts:
	package.json