fix merge probs
removed search model
delete search model, take 2
merged with master to get up to date, still need to fix vcr probs
got zip working and added zip search
added test for zip search. still need to assess google requests.
clean up config/database.yml.
Merge pull request #9 from botandrose/master

clean up config/database.yml.
Fixed the date tests
Merge conflicts resolved