Fixing some bugs in master not caught by the tests.
Making visa_tools compatible with pyvisa 1.5