bashrc & zshrc: read through.

Changes can be seen in the diff and I the only thing I checked is that
bash and zsh start without errors.