modified:   .gitmodules
	modified:   bundle/atp-vim
	modified:   bundle/awk-support
	modified:   bundle/clang-commplete
	modified:   bundle/emmet-vim
	modified:   bundle/syntastic
	modified:   bundle/tagbar
	new file:   bundle/vim-airline
	new file:   bundle/vim-fugitive
	modified:   bundle/vim-gitgutter
	modified:   bundle/vim-markdown
	modified:   bundle/vim-pathogen
	deleted:    bundle/vim-powerline
	modified:   bundle/vim-python-pep8-indent
	modified:   vimrc
	modified:   bundle/align (untracked content)
	modified:   bundle/awk-support (untracked content)
	modified:   bundle/drawit (untracked content)
	modified:   bundle/matchit (untracked content)
	modified:   bundle/omnicppcomplete (untracked content)
	modified:   bundle/srcexpl (untracked content)
	modified:   bundle/vim-voom (untracked content)
Merge branch 'master' of https://github.com/solomonwzs/dotvim

Conflicts:
	.gitmodules

	modified:   .gitmodules
	new file:   bundle/dockerfile-vim
	modified:   bundle/align (untracked content)
	modified:   bundle/awk-support (untracked content)
	modified:   bundle/drawit (untracked content)
	modified:   bundle/matchit (untracked content)
	modified:   bundle/omnicppcomplete (untracked content)
	modified:   bundle/srcexpl (untracked content)
	modified:   bundle/vim-voom (untracked content)