New bundles, misc changes
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  Some tmux specific changes

Conflicts:
	bundles.vim