Backward compatibility for servers which don't specify deviceName and deviceWrapper
Merge branch 'new_units' into GPIB
Merge branch 'new_units' of https://github.com/martinisgroup/pylabrad into new_units