Update bundle config to use new format

- Also, move plugin specific settings out of plugin/settings since Vim
  sources these automatically and there is no way to ensure they are
  sourced before Vundle sources all of the plugins.