Merge branch 'master' of github.com:lpcwww/dotfiles
UPDATE : .tmux.conf