Merged with RMBP
Correct issues and conflicts
Add zshrc checks for Mac/Linux