fix .vimrc; fileencoding
Merge branch 'master' of github.com:tatsuyafw/dotfiles

Conflicts:
	.vimrc