Updating Oh-my-zsh & hopefully fixing submodule.
Merge branch 'master' of github.com:rosstimson/dotfiles

Conflicts:
	.oh-my-zsh