Additions to search methods
Merge branch 'master' of https://github.com/spencerbrett/web-apps

Merging before going to bed (Daniel)