Clean up zshrc, pull some old changes from hgrc, bashrc