Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into master-mine
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into master-mine
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into master-mine
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into master-mine
Merge branch 'master' of github.com:unphased/oh-my-zsh into master-mine
Removing bad alias that screws over sending flags to "history"
Adjust prompt date