Assorted search cleanups

swcarpentry/amy#101 looks pretty good to me.  This pull request just
has some fixups cleaning up your commit.  Instead of merging this pull
request, I suggest you squash the changes into your commit.  Something
like:

    $ git remote add wking git://github.com/wking/swc-amy.git
    $ git fetch wking
    $ git checkout search
    $ git merge wking/search
    $ git rebase -i --autosquash 9dc82da
    … just exit your editor, no need to edit the suggested rebase procedure …
    $ git push -f barryrowlingson search

should do it.  The `barryrowlingson` in the last line should be
whatever you've called your https://github.com/barryrowlingson/amy
remote.

I've tried to explain my motivation for each change in the commit
messages, but please ask for more clarification if my motivation isn't
clear, or push back if my motivation doesn't make sense ;).