Merge remote-tracking branch 'origin/master'
Update vimrc
Merge branch 'master' of https://github.com/medvid/vimfiles