Add .bashrc and ~/bin to .profile
Update .tmux.conf for linux
Merge branch 'linux' into mac