Clean up (submodules are broken)
Some more cleanup
Readded as zprezto submodule
honing