Add .ssh/config
Merge branch 'feature_hb'