vimrc edits on eta
merged .vcs changes from lappy