Add customizations
Add some useful global aliases
Completion adjustments
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh: (161 commits)
  Add Stash toogle to display if there's some stash or not in `git_prompt_status`
  fixes #1474 add zeus to bundle exec listx
  use feature names instead of failing branch names in "git flow feature"
  Unset `config_file` variable in oh-my-zsh.sh
  Added a `migrate` alias.
  Fix prompt color: Change it back to green
  plugin last-working-dir: create cache-directory if it doesn't exist
  Print last exit status in mortalscumbag prompt
  urltools for Everyone
  Backwards Compatible Jira URLs #1378
  use lazy load for virtualenvwrapper
  hg_current_branch added to mercurial plugin
  Fixing conflict in install scripts
  Fixed Kernel Detection in battery plugin
  resolving conflict in termsupport plugin
  git find
  Functions for managing pacman-key
  Added Candy-Kingdom theme
  Added support for Mac to battery plugin
  Update plugins/sublime/sublime.plugin.zsh
  ...
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh:
  Fixes #1489
  add unbundled command
  Revert "agnoster theme shows error code instead of an "x""
I think I need a hostname in my prompt
add screenshot alias
add svn support
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

* 'master' of https://github.com/robbyrussell/oh-my-zsh:
  Fix rbenv gems helper
  add alias for rspec to zeus plugin
  added pj.plugin
  Adding MIT-LICENSE Closes #655
  Fix the fix for Issue #1479
  fix for Issue 1479
  More usable and shorter aliases
  Add option to disable status notification
  Added subcommands for leiningen 1.7.0
  blinks theme works with light and dark Solarized
  sprunge-plugin: Remove the unnecessary while loop.
  Fix the behaviour of the sprunge plugin so that is preserves whitespaces and tabs.
add venvwrapper project home
Merge branch 'master' of git://github.com/julianwachholz/oh-my-zsh into HEAD

* 'master' of git://github.com/julianwachholz/oh-my-zsh: (187 commits)
  update config
  add clear alias
  add django-admin.py alias
  add venvwrapper project home
  add svn support
  add screenshot alias
  I think I need a hostname in my prompt
  Completion adjustments
  Add some useful global aliases
  Add customizations
  gentoo linux support
  Cache for fasd --init
  Change sublime text path select priority on mac.
  Updating the README file
  Only trim remote names; be git-flow friendly
  Update rails4.plugin.zsh
  Add auto-completion for zeus.
  Added 'jekyll' to list of bundled commands
  mvn plugin was missing "redeploy" completion for tomcat.
  Added option to allow untracked files as non dirty
  ...

Conflicts:
	custom/aliases.zsh
	custom/zshconf.zsh