Merge pull request #339 from jonboulle/master

fleetctl ssh not detecting unit vs machine by default