Merge pull request #856 from sgharms/patch-1

Grammar update
Merge pull request #810 from cseeger/master

Git Plugin: add 'grhh' alias for 'git reset HEAD --hard'
Merge pull request #853 from lepht/master

Updated to the latest taskwarrior completion definition (2.0b4)
Merge pull request #811 from markdrago/remove_verbose_mercurial_flags

remove the -v flag from a few mercurial aliases
Merge pull request #801 from kalos/autojump

autojump plugin enhanced
Merge pull request #717 from blueyed/github-plugin-working-hub

github plugin: only alias git=hub if `hub --version` works.
Merge pull request #845 from tjwallace/bundler_plugin_fix

Fix bundler plugin for root level folders
adding rbenv support to all the rvm themes
adding engine yard command (ey) to bundler binstubs
Merge pull request #865 from iltempo/patch-1

Adding Engine Yard command (ey) to bundler binstubs
Merge pull request #860 from sbfaulkner/rbenv-support-for-themes

adding rbenv support to all the rvm themes
Merge pull request #850 from johnantoni/pow-fix

take in chris sexton's changes to the pow plugin
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