Moved some generic methods to a new Util class
Tweaked some search-related classes
Merge branch 'master' of https://github.com/bystam/cowboys-of-context
Merge branch 'master' of https://github.com/bystam/cowboys-of-context