Some changes
Merged
Finished merging zshrc