Adds vi filetype header
Merge branch 'master' of github.com:kevincolyar/dotfiles
Updates vimrc
Merge branch 'master' into debian