Tweaks to improve vim/cygwin shell escapes