updated against latest search branch, need to fix search tests
almost working tests, but ran into what I think is fixture weirdness
cs fix, fixed failing search tests
Merge pull request #172 from evillemez/search_tests

Search tests