Merge branch 'master' into debian
Merge branch 'debian' of github.com:kevincolyar/dotfiles into debian
Fixes remote tmux+ssh