git and vi dot files
Merge branch 'master' of github.com:tompropst/setup