Modified ssh/config
Merge branch 'master' of github.com:Ginja/dotfiles