wip
wip 2
Merge branch 'master' into Support_node_modules

Conflicts:
	lib/node_buildpack/engine/node_js.rb
	spec/node_buildpack/engine/node_js_spec.rb