Added oh-my-zsh as submodule
Corrected submodules
Merge branch 'master' of github.com:patrik-johansson/dotfiles

Conflicts:
	.gitmodules