Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	lib/completion.zsh
	lib/correction.zsh
	lib/directories.zsh
	lib/history.zsh
	lib/key-bindings.zsh
	lib/misc.zsh
	lib/termsupport.zsh
	lib/theme-and-appearance.zsh
	oh-my-zsh.sh
	plugins/autojump/autojump.plugin.zsh
	plugins/bundler/bundler.plugin.zsh
	plugins/extract/extract.plugin.zsh
	plugins/git/git.plugin.zsh
	plugins/nyan/nyan.plugin.zsh
	plugins/pip/_pip
	plugins/rails3/rails3.plugin.zsh
	plugins/svn/svn.plugin.zsh
	themes/gallois.zsh-theme
	themes/jonathan.zsh-theme
	themes/pygmalion.zsh-theme
	themes/suvash.zsh-theme
	themes/zhann.zsh-theme
	tools/check_for_upgrade.sh