started switching to using plugin.config_string in order to use defaults, refactored machine crawler and might have made add_known_machine more threadsafish, some as_user('root') since we're now running as marvin
merged in changes from gkv