Some vim changes, courtesy of Gary Bernhardt.
zhaozhou => dbe