Check in tmux conf, and latest tweaks
Merge branch 'master' of https://github.com/stevebarham/dotfiles