updating vim settings
Adding column marking
Merge branch 'master' of github.com:aaronholmes/dotfiles
Vundle was accidentally debeeted