vimrcのいらないやつをコメントアウト
Merge branch 'master' of https://github.com/lighty/dotfiles

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/lighty/dotfiles
noetをデフォにする