Handle SSH hosts without a @

Created by  Eelco Dolstra  on June 17, 2015
XO72X6PQOB2636JAVQTXC2WC7BYZTYVYTQDAWYFXZIQYCDIP6ALQC
Change contents