Many more changes to vim configuration.