local paths have changed
Merge branch 'master' of https://github.com/kolja/vimrc
vundle upgrade
merge