Shorten ControlPath for SSH (fixes 'too long for Unix domain socket' error)
Merge branch 'master' of git://github.com/davejamesmiller/dotfiles