fixes #6, adds test for it, and testing fixture
adds price filter, closes #7
Merge branch 'master' of github.com:kaitlin/hourglass

Merge @kaitlin's fixes for #6 and #7