Merge in vim configuration from poppy-dev.