Some more tweaks from instantly better vim 2012