Latest changes
Merge branch 'master' of github.com:voidcontext/dotfiles

Conflicts:
	.vimrc