changed zsh prompt
switched vim to solarized
Merge branch 'master' of github.com:PowderedToastMan/dotfiles