Clean up
New vim and zsh options
Merge branch 'master' of github.com:jdahm/dotfiles