Changed the name of the layout file to application, like it should have been.
Render correct, blank page on /search
Remove some unused search code; updated some search links to the new format.
Merge remote-tracking branch 'origin/master'