Squashed 'oh-my-zsh/' changes from 357ab49..ce6a15d

ce6a15d Squashed commit of the following:
ca90021 Merge pull request #2576 from jeffwilliams/master
81d53af Merge pull request #2597 from githubhjs/master
12415a9 Merge pull request #2539 from chriswiggins/master
dcae31d Merge pull request #2549 from brandon-beacher/master
23a43e9 Merge pull request #2574 from thiagowfx/linux-battery
080409a Merge pull request #2603 from docwhat/ssh-agent-hostname
fed8076 Merge pull request #2607 from avonderluft/dev
8ee9971 Merge pull request #2613 from Fisiu/ignore-ssh-users
b56e8fb Ignore more users in ssh completion.
c9e7129 Merge pull request #2602 from blueyed/use-default-hosts-completion-2
bf4d4db Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
8f79713 add option to show dirty status of current dir
ee21fe9 Merge pull request #2380 from rkh/chruby-gallois
8d8df3f Merge pull request #2435 from tompelka/master
d943d23 Merge pull request #2466 from jarus/steeef-virtualenv-fix
07c2bdf Merge pull request #2588 from kerimdzhanov/remote-themes-copyright-info
d752c8c Merge pull request #2584 from joukojo/master
3b604c6 Merge pull request #2590 from zhouhua015/master
d058c9d Merge pull request #2593 from bobmaerten/typo-docker-plugin
552aab6 Merge pull request #2591 from kevinxucs/remove-extra-aliases
cfe468f ssh-agent: prevent environment file from flapping
47b0d75 Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install
71d9420 Use zsh's default for ':completion:*:hosts'
de78e47 Merge pull request #2149 from cristim/master
7adf66f Merge pull request #1355 from F30/key-bindings
ca648ae Merge pull request #2072 from jorge-d/master
d65a153 Merge pull request #2595 from ksamdev/git.io
d0dcedc Merge pull request #2421 from LFDM/rails_plugin_fix
7c95518 Merge pull request #2518 from erawk/master
0d76d9e Merge pull request #2326 from zakkak/master
e8b85f9 Merge pull request #1776 from ronshapiro/master
a5df4d7 Merge pull request #1501 from gambhiro/master
9cb14dc Merge pull request #1085 from avit/install-path
d8ed8f6 Merge pull request #650 from tristan0x/emacs
9272b0b Merge pull request #2600 from jontewks/patch-1
5f5e550 Update license year
b6cbba9 Updating README to show the new install URL, which redirects to the raw files on github.
86a272e Merge pull request #2596 from ryanwmarsh/fixing_bureau_scrollback
ae2f6f3 List pkgs by size
c3c8cc3 Fixes #2467 tab completion scrolls back in terminal when using bureau theme
b9841b0 Add github url shortener
3c9a29b Fix typo in autocomplete arguments
b71a2b9 Removed unsolicited aliases.
de0e7b5 Fix hgsl alias.
48579eb Merge pull request #2341 from mcornella/title_backticks
9f66d5b Document alternate install paths via ZSH variable
da1fa3b Abort installer on errors
2e11e2a Write install path into .zshrc
5bd590c Reference default install path from ZSH variable
c249c69 Remove all copyright information in themes. Closes #2587
a811ab0 Merge pull request #2331 from posva/catimg
e744bf2 Merge pull request #2479 from mrbfrank/theme-agnoster
6a2e65f Merge pull request #1402 from sergeylukin/master
59db638 Merge pull request #2565 from theallegedjosh/master
7b7c5fd Merge pull request #2579 from mfaerevaag/master
0018969 Merge pull request #2535 from IgorTimoshenko/feature/yii-plugin
01261d4 Merge pull request #2556 from chrisjones-brack3t/fix/git-prompt-1-9
0e10ebb Merge pull request #2572 from kevinxucs/sublime-linux-fix
0e31bed Merge pull request #2059 from felipec/fc/gitfast
755f809 Merge pull request #2529 from emanuelez/patch-1
95e6fea Merge pull request #2525 from lukesteensen/update-go-plugin
ae9a9b7 Merge pull request #2481 from felds/master
7b06ce7 Merge pull request #2366 from chuancong/patch-1
cc926e9 Merge pull request #2322 from dpsk/patch-2
92a54eb Merge pull request #2166 from cap10morgan/no-clobber-rbenv-root
978bb40 Merge pull request #2564 from miry/patch-3
9bd9278 Merge pull request #2287 from rumpelsepp/master
7a14ab7 Merge pull request #2400 from bric3/svn_fast_plugin
deb08a7 Merge conflicts with af-magic theme
2208854 Cleaning up conflict with merge of #2330
fd8ce7f added mvnjetty alias
7378765 added aliases for tomcat:run tomcat7:run
8b667b2 added mvn-update
d41ac7f Updated wd plugin to v0.3.0
c0b98cd Added dirhistory plugin.
2691520 Integrate changes from #1841.
564a708 added the linux implementation to the battery plugin
5ba96e9 Fixed sublime plugin behaviors.
6dcdfe6 :panda_face: Added simulator alias for Xcode plugin
fdbf0cb gem push alias and gem yank alias
da573f6 add gem push alias
f139401 add gem build alias
6b3c953 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
6cc2408 ..a fundamental piece of matter.
74ad998 Merge pull request #2548 from puffnfresh/gitignore-plugin-url
2eb68a4 Merge pull request #2544 from fduch2k/patch-1
8309b0a Verification of convert inside the function
c397000 grab last item in list which is the branch instead of relying on position.
7a54636 Much needed PEP8 love. Use spaces, not tabs.
a951600 Avoid 'title:parse error' with single quotes in $CMD Fixes #2182
3e5de21 Revert previous commit, escape %
b73ced3 Use single quotes also in $LINE definiton
b0fbe0d Avoid evaluating special chars in $LINE on title command (fixes #2234)
598a9c6 Adieu l'ami.
500cbbc Merge pull request #2541 from puffnfresh/cabal-sandboxes-info
840ae43 Remove mailcatcher from the bundler plugin.
c0f716b Fix remaining broken URL in gitignore function
bd4f7e2 Update gitignore.plugin.zsh
861290e Merge pull request #2542 from puffnfresh/gitignore-plugin-url
1df7d01 Fix URL to gi (gitignore) function
358b6ff Add cabal_sandbox_info function
fdd864b Update battery plugin to show calculating - OSX
354593e Added Yii basic command completion
f6f3e93 Improve oneline logs
aa9db3e update golang plugin to match official version
2078e7d remove duplicate 'go' plugin, symlink to 'golang'
f3f0a54 Updated _brew zsh autocompletion to latest Homebrew upstream
4ce7f0a Merge pull request #2515 from nupfel/plugins/iwhois
2ed9903 Merge pull request #2516 from lukesteensen/patch-1
0d212bb Add 'services' command to homebrew completion
0cb2ecf provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server
ec37c05 Merge pull request #2465 from klange/master
7a6e2c0 Merge pull request #2342 from blackjid/master
41d9717 Merge pull request #2402 from bric3/battery_level_gauge
4d83da7 highlight the username when root
685ea4a theme agnoster: remove trailing space
7daaa18 corrected branch character
df0305a Merge pull request #2368 from lumbric/master
78ffa71 updated url to latest powerline-patched fonts
3d41804 Improve virtualenv prompt in steeef theme
a48fd1e Update nyan.plugin.zsh
9b3344d change nyancat telnet server
cc8b093 Adds a method that print a battery gauge
23e57c1 Adding commit hash to branch name in my favorit rjk-repos theme.
a667191 Fixes _rails_command
ca129bb Renames main plugin function to `svn_prompt_info`
f66ab7f Renamed the methods of this script
8ede6c6 Added further cleanup and svn status information
b0b79e0 No need to eval in rvm_prompt_info!
8bf8e1e Heavy refactor of svn-fast-info
d485044 Merge pull request #2389 from driver2000/patch-1
a609fd5 Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find
642ae64 Inline `parse_svn` to avoid leaky state
1304ed8 Report the SVN need upgrade
2d6d9d5 Fixes RPROMPT in af-magic.zsh-theme
85fde31 Renames the file to prompt_info_functions.zsh
082607c Adds documentation.
72392a2 Adds all other dummy implementations.
9ce1b62 new faster SVN plugin
4354f91 Fixes tmuxinator plugin find on OSX
e2838f7 Merge pull request #2396 from soluwalana/master
d60522c escape dashes
827d9df Update git.plugin.zsh
3e5e2d4 Fix bad right prompt placing.
c6aacf6 Refactors ruby_prompts.zsh
8a887c5 Joins ruby prompt files and adds ruby_prompt_info.
7aa7661 Adds chruby_prompt_info dummy function.
ae6ded5 Returns false when rbenv is not found.
468b24a Returns false when rvm is not found.
bbbff94 Fixes rvm_prompt_info() in lib/rvm.zsh
f6bb74e add chruby info to gallois theme
b58b996 fix name schema for sudo plugin
e41b6ac Add support to command "show"
a38af27 Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory."
c9e5adb Merge pull request #2358 from n-st/master
152e1e0 Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
dbdd23d Prevents oh-my-zsh loading the .zshenv twice
fdfc907 Add rdmtc alias for rails plugin.
c05a28a typo fix
44b23ae catimg: fix exit without using source supresses errors from convert whilen converting, as they are usually just warnings
349fa15 Fixed a dirs bug for catimg
cbd63f2 Fix for virtualenv support - fixes #2328, fixes #2297, resolves #2319
0185d99 catimg plugin allow to print an image to the stdout using convert
e978119 Improve comments
be6b1b3 Improve comments
c9f2c94 Added/modified some useful aliases.
3ca3c5a don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
190fcdf Added a completion plugin for the new aws-cli tool
90b83b8 Add completion for package add and remove
dd22015 Add autocompletion plugin for meteor command
9ebdbec gitfast: update to upstream v1.8.4
ae1973d plugged_in function
c95b6d9 git lol
46ad733 more catspeak
ebeae4a Fix /bin/sh compatibility issue in install.sh
174c917 Replace hardcoded key escape sequeneces with dynamic ones from terminfo.
ff0cafa Make sure the terminal is always in application mode when zle is active.
3839c6e Don't clobber standard Esc+. behavior
f7708d4 forgot to save before committing. doh
68cec79 Added documentation to key bindings.
a01b1fe Do not overwrite EDITOR environment variable if already defined.
3a408f3 Comment
db90589 Merge remote-tracking branch 'upstream/master' into emacs
7066bf7 Fix builtin `ecd' when file path contains space characters.
574de93 New function `efile`
6f1929f Fix indentation
9b29136 Fix alias `eeval'
49c0a13 - Fix pass of parameters - Add new function `ecd'.
a183bcb More comments
5d90f58 I should not have merged this here.

git-subtree-dir: oh-my-zsh
git-subtree-split: ce6a15d4557e1cc441e971466c409238c33e3073
Merge commit '90d6721a0147ed4c1e0c39338f896158ae1fb03d'