Merge pull request #663 from gravof/patch-1

Replace "git-diff" with "git diff" in the git plugin
added rails to bundled_commands
prompt git-remove as deleted
update rails runner alias to ru

- avoid rr as it is mostly used for restart rails server
Removed trailing spaces in Git files. Fixes #867
Merge pull request #666 from szetobo/rails_runner

add rails runner alias
Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes
added "publish" and "track" command completion for git-flow plugin
add default rbenv_prompt_info implementation to close #878
fixed asterisk display for modified repos in git prior to 1.7.2
changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
fixed introduced to parse_git_dirty
handle case where ~/.rvm/bin/rvm-prompt is not in path, so "which" can't find it
blinks theme works with light and dark Solarized

The blinks theme now looks good if you're using the light version of the
Solarized color scheme, too.  It still defaults to the dark version, so
it should work as before if you don't override things.  If you're using
the light version, just set SOLARIZED_THEME to "light" before sourcing
oh-my-zsh.
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge pull request #925 from cruser42/bugfix/gitversionfix

Bugfix/gitversionfix
Merge pull request #868 from wgriffioen/bundler_add_rails

added rails to bundled_commands
Fixed bug introduced when fixing issue 896
Merge pull request #958 from cruser42/master

URGENT: Fix for bug introduced in pull request 925
Fix spurious correction with sudo vim

user@host:~ $ sudo vim /etc/rc.conf
zsh: correct 'vim' to '.vim' [nyae]? 

http://www.zsh.org/mla/users/2012/msg00028.html