Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
My personal changes
Personal changes
Peronalized amuse theme
Improved personal amuse theme
Improved personal amuse theme
Remove add-zsh-hook since it is not supported on build machines
Improved prompt
Improved Prompt
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'personal' of https://github.com/rovere/oh-my-zsh into personal

Conflicts:
	custom/plugins/aliases/aliases.plugin.zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	lib/termsupport.zsh
Merge branch 'master' into personal
Add cmsdev alias
Merge branch 'personal' of github.com:rovere/oh-my-zsh into personal