Merge branch 'master' of https://github.com/vyvy/myconf

Conflicts:
	.vimrc
	.vimrc_ex