updated vimrc to use vundle, etc
Merge branch 'vim-fix'