Install js-ctags bundle as a submodule.
Install tagbar bundle as a submodule.
Mac
Merge branch 'master' of https://github.com/jaramago/dot-vim

Conflicts:
	.gitignore
	.gitmodules
Merge .gitmodules