Update tmux shortcuts. Introduce nice little switch alias
'
Merge branch 'mac'

Fastforward master on mac