Using vim-polyglot now
Merge branch 'master' of https://github.com/lfilho/dotfiles

* 'master' of https://github.com/lfilho/dotfiles:
  Using vim-polyglot now

Conflicts:
	vim/bundles.vim