Update from
Merge branch 'master' of https://github.com/akofink/dots

Conflicts:
	.vimrc