Merge pull request #5 from mweastwood/improvements

A more rigorous battery of tests for the q_str macro
Extend functionality of MeasurementSets