added alpha to config
added captaincommando as cc to sshconfig
Merge branch 'master' into mac