Merge pull request #13 from ssayer/bundle_scoping

add the ability to scope measure lookups to bundle id
I wish I could find a reason to reject this pull request since it uses the ternary operator. Alas, I cannot.
make test less brittle, and hopefully give a better failure message