find tokens in the captions of uploaded files

Squashed commit of the following:

commit 17414a68266a6e15941b938715680b39bc087a64
Author: Sumana Harihareswara <sumanah@wikimedia.org>
Date:   Fri Mar 15 20:08:15 2013 -0300

    fix missing "where I am" indicator

    I'm on the commons beta cluster site.

commit 9f796285b2a3746b5dcf9d8f615182af4052545d
Author: Sumana Harihareswara <sumanah@wikimedia.org>
Date:   Fri Mar 15 19:28:27 2013 -0300

    find tokens in the captions of uploaded files

    from https://www.mediawiki.org/wiki/QA/Browser_testing/Test_backlog#Search

Change-Id: I9c600eefa6633609fc11929ef33a79cf8ec60015