Updating modules
Merge branch 'master' of https://github.com/jonahkagan/dotfiles

Conflicts:
	.gitmodules