Slater/clean search

Github totally freaked out and broke on the last pull request. Making a new one in hopes of circumventing that.
@gwprice @nedbat