update
Merge branch 'master' of github.com:rtakasuke/.dotfiles

Conflicts:
	.vimrc