Merge pull request #121 from fsteeg/issue-115-queries

Update queries, views, and tests for new data format