.vimrc update from Software Design 2013/10