Half-done smap-tool changes for https://github.com/SoftwareDefinedBuildings/smap/issues/1