Have you considered using kpcli and Keepass files to store server info for machines not set up with key based login? I use it on OSX with my keepass database and it works pretty well. See http://kpcli.sourceforge.net/