Tweaks from damien conway's Instantly Better Vim 2012