Removed bash settings and merged everything into zshrc