Added -s option to add shortnames too

Useful to connect as "ssh testvm001"