Renamed ``plain-master`` to ``plain``, so the uids of instances are nicer.
Fix removal of bad host keys when using non standard ssh port.