upmod
Merge branch 'master' of https://github.com/garetjax-setup/dotfiles

Conflicts:
	.gitmodules