Some vim changes
merge