some new aliases screen/tail
Make history more bash-like
Only correct commands
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh:
  Revert "Enable red dots during completion by default".
  Add an alias for ga --> git add, too
  Add gss alias for git status -s
  Add guard to bundler plugin's wrapped commands
  Heroku completion plugin
  Added auto complete plugin for powder gem https://github.com/Rodreegez/powder
  'echo' did not show colors without -e in upgrade.sh
  Replace forgotten rubies with authors
  Add autocomplete for gas. Based on the rvm plugin.
  Enable red dots during completion by default
  Display red dots during completion process (disabled by default)
  Add key bindings for gnome-terminal on Fedora
  Minor corrections to deletion detection in git_prompt_status
  Included some essential aliases, inspired by http://lolcode.com/
Merge branch 'master' of github.com:apm12/oh-my-zsh

* 'master' of github.com:apm12/oh-my-zsh:
  Only correct commands
  Make history more bash-like
correction
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh: (63 commits)
  Fix up some wonkiness
  Add new theme: wuffers
  added git merge as gm
  Better cake completion: don't barf on options, and don't clobber user's namespace
  This is the correct way to check the return value
  This needs to explicitly check the return value
  split rkj into two themes.
  terminitor plugin: add autocompletion also for edit, delete and setup subcommands.
  terminitor plugin: add autocompletion for start subcommand.
  Add basic autocompletion for terminitor (https://github.com/achiu/terminitor).
  Textmate plugin update to take Gemfile and cucumber features in account
  Added VCS prompt to Apple theme.
  [plugins/grails] Remove warning message; it's always displayed
  [plugins/grails] Use globbing instead of grep
  [plugins/grails] Added grails plugin
  fix completion for commands wrapped with bundler
  vundle call fixed for new vundle version
  add foreman, nanoc, and rainbows to list of bundled commands
  order aliases alphabetically
  Fix auto upgrade failure from non-exported ZSH env var
  ...
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh: (49 commits)
  Fixed the rfind command in the  ruby plugin
  Get the Hostname
  bundler plugin - don't "bundle exec rails"
  Updating installation documentation to show a curl example as well for those who don't have wget installed.
  Added example aliases in ZSH template. Added a new theme.
  Black on white theme inspired by Sam Stephenson's terminal screenshot on https://github.com/sstephenson/rbenv
  Fix upgrade and uninstall functions to pick up $ZSH value
  Added alias gcm='git checkout master
  Added support for entries in /etc/ssh/ssh_known_hosts.
  Ignore submodules dirty in prompt info
  add note about custom plugins
  show gemset next to ruby version
  adding support for chef environments in knife plugin
  Symfony 2 completion
  add sprunge.us pastebin uploader - uses files, or pipes
  add support for autojump installed via macports
  Added my own theme file : suvash
  forks miloshadzic theme to add more directory info as well as user and host info
  Added message when caching packages
  Added caching of packages
  ...

Conflicts:
	lib/history.zsh
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh: (37 commits)
  Fixed bug introduced when fixing issue 896
  fixed introduced to parse_git_dirty
  changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
  fixed asterisk display for modified repos in git prior to 1.7.2
  Removed trailing spaces in Git files. Fixes #867
  update rails runner alias to ru
  added rails to bundled_commands
  adding engine yard command (ey) to bundler binstubs
  adding rbenv support to all the rvm themes
  Add middleman to bundled commands
  Grammar update
  Updated to latest version of taskwarrior completions (using Taskwarrior 2.0b4)
  bug : stop creating those ~ directories add powit command to symlink an app if it hasn't been already
  don't check for tmp dir
  add alias to view the standard out (puts) from any pow app
  take in csexton's changes
  fix for pow plugin to default to current dir
  added a rake plugin to disable zsh file globbing when calling rake tasks with square brackets
  fix bundler plugin for root level folders
  fixing #812: adding plugins w/o plugin.zsh file to fpath.
  ...
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh: (60 commits)
  auto-upadate feature will now reset the epoch so that if a user doesn't say yes, it won't ask them again for a while. fixes #1240
  'rails' command should not be run with bundle exec
  utilize sublime's embedded command line binary
  escape whitespace
  provide plugin for rbfu the ruby version switcher
  Remove bogus "-" from nomz="ps -aux" alias.
  Added another path
  Fix finding git issue. http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script
  added jexec
  added plugin for jruby
  correct the ruby version label for rbenv
  theme cleanup
  added first version of my theme af-magic
  sanitized code according to coding style
  rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder
  remove readlink call and clean up
  Explicitly tell rbenv to use zsh
  Fixed unmached " in yum plugin
  add --directory flag
  Updating README to ask people to stop sending themes for now
  ...