Stupid submodules
Fixing submodules again.
Adding more things.  Adapting to using upstream for oh-my-zsh
Merge branch 'master' of github.com:wtlangford/dotfiles

Conflicts:
	zshrc