refactor of search, cutting tools - to support new model, general housekeeping
Merge pull request #75 from ktsweb1/master

Eric: general housekeeping, refactor of Cutting tools and Search