some changes
Merge branch 'master' of https://github.com/genos/dotfiles

Conflicts:
	vimrc