Added my tmux settings
Added shuttle to office_head
wanted the updated bash_aliasses here
Merge branch 'master' into no_plugins