Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	.gitmodules
	README.textile
	completion.zsh
	history.zsh

plugins/node/functions/node-docs

@@ -0,0 +1,10 @@
+#
+# Opens the Node.js online API documentation in the default browser.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+# TODO: Make the sections easier to use.
+open "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
+

plugins/node/init.zsh

@@ -0,0 +1,17 @@
+#
+# Completes npm.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+cache_file="${0:h}/cache.zsh"
+if [[ ! -f "$cache_file" ]] && (( $+commands[npm] )); then
+  # npm is slow; cache its output.
+  npm completion >! "$cache_file" 2> /dev/null
+  source "$cache_file"
+else
+  source "$cache_file"
+fi
+unset cache_file
+