Improved prompt
Improved Prompt
Merge branch 'master' into personal
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' into cern
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' into cern
Merge remote-tracking branch 'remotes/rovere2/cern' into cern
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'cern' of https://github.com/rovere/oh-my-zsh into cern
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	lib/termsupport.zsh
Merge branch 'master' into cern

Conflicts:
	lib/termsupport.zsh
Merge branch 'cern' of github.com:rovere/oh-my-zsh into cern