Moved common bash/zsh stuff to .commonrc. Also, first zsh fixups