Merge

This contains a few changes:

- Include PID, listed_at in response
- Allow county, bedrooms, neighboorhoods to be supplied in CL query
- Some refactoring
- More spec coverage