zsh: adding my zsh theme
zsh: removing the shared history bit of different sessions
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge remote-tracking branch 'ohmyzsh/master'
Adding mbant's addition for vi-mode information to RPROMPT of hokietux theme.
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
zsh: make OMZSH pull from official source by default
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Once again fixing upstream source.
zsh: adding my zsh theme
zsh: removing the shared history bit of different sessions
Adding mbant's addition for vi-mode information to RPROMPT of hokietux theme.
zsh: make OMZSH pull from official source by default
Once again fixing upstream source.
Merge branch 'master' of github.com:bhilburn/oh-my-zsh
Purging vi-mode from ZSH
Merge branch 'master' of github.com:bhilburn/oh-my-zsh

Conflicts:
	themes/hokietux.zsh-theme
	tools/upgrade.sh