Merge branch 'master' of github.com:tlevine/nvm

Conflicts:
	nvm.sh
tree: b1ae9983d490945fc61e69d32af63b7b57b8a4c3
  1. .gitignore
  2. .npmignore
  3. bash_completion
  4. nvm.sh
  5. README.markdown