最新に更新
install場所のミス
もとに戻す
修正を戻す
fixed
fixed
fixed
add smarty
Merge commit 'ac72544aaebccbb428533f0169b0e0786c333786'

Conflicts:
	.gitignore
	.gitmodules
	_vimrc
	vimfiles/bundle/vim-airline