修改配置
test
Merge branch 'master' of ssh://github.com/michaelzf/work_out

Conflicts:
	.vim/bundle/FuzzyFinder
	.vim/bundle/L9
	.vim/bundle/Solarized
	.vim/bundle/SuperTab
	.vim/bundle/Syntastic
	.vim/bundle/TagHighlight
	.vim/bundle/Tagbar
	.vim/bundle/The-NERD-Commenter
	.vim/bundle/TimeTap
	.vim/bundle/a.vim
	.vim/bundle/clang-complete
	.vim/bundle/ctags.vim
	.vim/bundle/minibufexplorerpp
	.vim/bundle/neocomplcache
	.vim/bundle/neocomplcache-clang_complete
	.vim/bundle/powerline
	.vim/bundle/superSnipMate
	.vim/bundle/surround.vim
	.vim/bundle/taglist.vim
	.vim/bundle/vimwiki
	.vim/bundle/vundle
	.vim/bundle/winmanager