S000: tweaks to .vimrc

Change-Id: I26a81ea9e85208360a5901e08386aed13c6ccdf3