add
Merge branch 'master' of github.com:taizilongxu/dotfiles

Conflicts:
	vim_set/bundle/solarized