modified:   vimrc
Merge branch 'master' of https://github.com/lord2k/vim
changed vimrc and deleted .vim