Update some submodules.
Remove duplicate .vimrc C-^ binding.
More vim stuff.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  More vim stuff.
  Remove duplicate .vimrc C-^ binding.
  Update some submodules.