overide system vi, lint fixes
Merge branch 'master' of https://github.com/watsoncj/dotfiles
prompt colors