Merge remote-tracking branch 'upstream/master'

* upstream/master: (132 commits)
  Options with spaces now work in prompt_menu.
  Install vim-vinegar for file browsing with -.
  Make gv (edit .vimrc, .gvimrc) alias cd to file location.
  Improve "gt" gittower logic.
  Remove q. alias, it's no longer necessary with vim.
  More vim stuff.
  Remove duplicate .vimrc C-^ binding.
  Update some submodules.
  Lots of little vim tweaks, many courtesy @gf3.
  vim/mvim is now the default editor, other vim tweaks.
  Update stale links in README.
  Minor ubuntu sudoers tweaks.
  More minor nave/npm function tweaks.
  Minor nave/npm function tweaks.
  Completely refactor nave aliases.
  Simplify ubuntu apt package installation.
  Show nave install.
  Make setdiff usage more consistent.
  Allow setdiff to work with actual arrays.
  Prettify colorPicker symlink fix output.
  ...

Conflicts:
	README.md
	bin/dotfiles
	init/10_osx.sh
	init/10_ubuntu.sh
Merge branch 'master' of https://github.com/bondezbond/dotfiles

* 'master' of https://github.com/bondezbond/dotfiles:

Conflicts:
	bin/dotfiles