Updated.
Merge branch 'master' of https://github.com/mikoto2000/dotvim

Conflicts:
	.vimrc