removed bad (for ubuntu) ssh option
more generic alias structure, some ssh entries