Include matching folder names for keyword search: Closes bgo#722756

Photos in the library match on their folder names up to the library
root.  Photos outside the library match only on their folder name.