weekly commit
Merge branch 'master' of https://github.com/ssmike/configs

Conflicts:
	.vimrc