Remove os x include file
Remove tmux alias
Merge branch 'master' into osx