Merge branch 'sanritz'
foget
modify gvimrc
Merge branch 'master' into sanritz