Merge branch 'master' of github.com:oesmith/dotfiles into home

Conflicts:
	.gitmodules
Merge branch 'home' of github.com:oesmith/dotfiles into home