Modified .vimrc
Merge branch 'testing'