Merge some of my old zshrc