updated vimrc
completely new vimrc
Merge branch 'master' into lisnr