updated zsh settings to for oh-my-zsh

Fixed previous bugs around getting oh-my-zsh to work with existing
aliases and variables. Both now work. This fixes the zsh settings issues
bug on Pivotal
Merge pull request #5 from currica/79307166_zsh_settings

updated zsh settings to for oh-my-zsh