Search refactor

This is based from master and should be able to merge now.  Will wait till this one is merged before starting the next.
Since we don't actually use the file name as a match to the URI, and since we only have one set of sample data for search, I just used search.xml.

Also... Dune is amazing. :)