include d3 shim config for jspm
Merge branch 'master' of git://github.com/guybedford/d3

Conflicts:
	package.json