modify vim config

avoid the "Hit ENTER to continue"
Merge branch 'master' into sanritz