npm binary path configurable
Merge branch 'master' into npm-configurable

Conflicts:
	lib/capistrano/node-deploy.rb