Merge pull request #917 from agate/patch-1

added "publish" and "track" command completion for git-flow plugin
Merge pull request #1633 from alec-c4/master

rails4 plugin
Resolving conflict with merge of #1058
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
Spin to bundler
Merge pull request #1254 from systemfreund/master

Added completion plugin for "Go" compiler
Merge pull request #690 from essembeh/master

Adding ~/.ssh/config parsing for host list and theme.
extend mercurial plugin to be more like git/svn

implement in_hg(), hg_get_branch_name(), hg_prompt_info(), and hg_dirty() for the mercurial plugin
named functions similar to subversion plugin, to give theme maintainers an easier life
Fixed missing retcode function
Update the wrong variable used in rb20 function. Fixes #1762

Signed-off-by: Joni Chandra <joniliciously@gmail.com>
Uncomment l alias
Change sublime text path select priority on mac.

User changed symbolic link for sublime binary is now top priority,
since this allows users to actually specify which version of sublime
they want to use. Sublime text 2 binary has higher priority over
sublime text (3) binary, since sublime text 2 is considered more
stable.
eliminated unnecessary cd and failing substitution

Changing the working directory in a sub-subshell
does not change the working directory of the executing
shell.

The substitution was broken for me on _all_ my machines,
so I started looking into the business.
plugged_in function
Cache for fasd --init

Using cache technique for faster fasd --init as shown at:
 https://github.com/clvv/fasdi#install
Merge pull request #1779 from lorn/fasd_update

Cache for fasd --init
Merge pull request #1774 from kevinxucs/sublime-default-2

Change sublime text path select priority on mac.
rm alias gcm='git checkout master' and add alias gcm='git commit -m'
rename gcm to gcmsg and stand for 'git commit -m'
rename gcm to gcmsg and stand for 'git commit -m' #1790