Adding work-related modules.
Merge branch 'master' of github.com:elkorn/dotfiles

Conflicts:
	.gitmodules