Skip queueing to get machine_info, use sinfo instead
Use switch statement to allow for additional implementations
Add docstring
Merge branch 'master' into sysinfo_from_sinfo
Generalize function name