set vim on the command line
Merge branch 'master' of github.com:mstarkman/dotfiles