Upgraded bluebird, spawn is deprecated
Merge branch 'master' of github.com:geekingfrog/zeninjector

Conflicts:
	package.json
	test/container.js