Merge pull request timshannon#31 from rmg/empty-result-on-empty-bucket

Give empty results on empty bucket queries

Merge pull request timshannon#28 from timshannon/develop

Develop