Python 2 fixes
Add support for PyVisa