mac profile additions, tmux conf terminal setting
Merge