bundle
vimrc
Merge remote-tracking branch 'origin/master' into offair

Conflicts:
	vim/.vimrc.plugins_setting
bundle setting
Merge remote-tracking branch 'origin/offair'
merge