modified:   .gitmodules
	modified:   bundle/minibufexpl
	modified:   bundle/phpctags
	modified:   bundle/syntastic
	modified:   bundle/tagbar
	modified:   bundle/tagbar-phpctags
	new file:   bundle/vim-markdown
	new file:   bundle/vim-voom
	modified:   vimrc
	modified:   bundle/vim-voom (untracked content)
Merge branch 'master' of https://github.com/solomonwzs/dotvim

Conflicts:
	.gitmodules

	modified:   .gitmodules
	new file:   bundle/vim-erlang-tags
	new file:   indent/erlang.vim
	modified:   vimrc
	modified:   bundle/vim-voom (untracked content)