Improve whitespace handling in vim