Modified .vimrc and/or .gvimrc
Merge branch 'master' of ssh://github.com/Elzair/my-vimrc
Fixed merge conflict