Update main.zsh to load in temp.sh on reload
Update directories for current projects
Merge branch 'mac'

Update directories and config on mac and fast-forward master