Pull whitespace change from vim72 branch for consistency