adding some vim things
vim changes
Merge branch 'new-vimrc'