zsh and bash changes
Merge branch 'master' of github.com:bitemyapp/dotfiles