Added .tmux.conf.
Added .tmux.conf.
Merge branch 'master' into atlassian