vimrc file I used for Linux.
Merge branch 'master' into topic/vimrc