Add OSX-specific options for Tmux
Add git settings
Merge