Merge remote-tracking branch 'upstream/master'

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

plugins/ruby/init.zsh

@@ -0,0 +1,43 @@
+#
+# Configures Ruby gem installation and loads rvm/rbenv.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+# Loads RVM into the shell session.
+if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+  # Auto adding variable-stored paths to ~ list conflicts with RVM.
+  unsetopt AUTO_NAME_DIRS
+
+  # Source RVM.
+  source "$HOME/.rvm/scripts/rvm"
+# Loads manually installed rbenv into the shell session.
+elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
+  path=("$HOME/.rbenv/bin" $path)
+  eval "$(rbenv init - zsh)"
+# Loads package manager installed rbenv into the shell session.
+elif (( $+commands[rbenv] )); then
+  eval "$(rbenv init - zsh)"
+else
+  # Install local gems according to Mac OS X conventions.
+  if [[ "$OSTYPE" == darwin* ]]; then
+    export GEM_HOME="$HOME/Library/Ruby/Gems/1.8"
+    path=("$GEM_HOME/bin" $path)
+  fi
+fi
+
+# Aliases
+alias b='bundle'
+alias be='b exec'
+alias bi='b install --path vendor/bundle'
+alias bl='b list'
+alias bo='b open'
+alias bp='b package'
+alias bu='b update'
+alias bI='bi \
+  && b package \
+  && print .bundle       >>! .gitignore \
+  && print vendor/bundle >>! .gitignore \
+  && print vendor/cache  >>! .gitignore'
+