Update the things and the stuff.
Merge branch 'arch' of github.com:elkorn/dotfiles into arch

Conflicts:
	.gitmodules
	dotfiles/.vim/plugin/projects.vim