adding oh-my-zsh
Merge changes -- what's up with rebase