Instrument control

[nmaterise]

• Includes file naming and TWPA scanning updates
• Updates to handle calibration with Python
• Addresses duplicate signal errors
• Resolved minor merge conflicts with @nickkprice's latest pull request

[nmaterise]

Closing this pull request -- found another bug, will open another PR to replace it.