Doing something to gitmodules...
Revert project files to correct status.
Update configs.
Update gitignore
Merge branch 'arch'
Merge branch 'master' of github.com:elkorn/dotfiles

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