Small updates
Merge branch 'master' of git://github.com/zakvdm/ZakConfig

Conflicts:
	.vimrc