Add .gvimrc
Merge branch 'testing'