search and search form
fixed conflicts
Merge pull request #30 from tomsword/search-improvements

Search improvements