Update + new plugins
Merge branch 'master' of github.com:emilecantin/vim-config

Conflicts:
	bundles.vim