cleaned up submodules, added back custom zsh stuff