merge changes from offical repo
clean up rbenv support for 'fino' theme
Added kafeitu theme it modified by robbyrussell
move kafeitu.zsh-theme to themes folder
add hostname behind username, example: henryyan [02:07:20]  ~/.oh-my-zsh git:(master) ✗
change color of @ to cyan
delete time filed
Add a cat smilie as alias for cat
add maven plugin
[themes/josh] Use $(current_branch) in prompt
add the half-life theme based on steeef and lambda
small changes to make it prettier
Added subcommands for leiningen 1.7.0
Adds glo; glp (arg)

* glo := git log --oneline
* glp := git log --pretty=arg
Add Theme "itchy"
Merge remote branch 'upstream/master'

Conflicts:
	lib/completion.zsh
Add option to disable status notification

For certain git repositories, this slows down usage
of the shell horifically.

This option can be set with

    git config --add oh-my-zsh.hide-status 1

which will disable checking/showing the status notification
Add instructions on handling updates and prompts.
Fix formatting
added 'gcl'for 'git config --list'; and gd for 'git diff'