Add reasonable defaults to help with Acquiris compatibility.
Merge branch 'develop' of https://github.com/BBN-Q/Qlab into develop