add info about VIM in readme
Merge branch 'master' into 12.04