Fixed some of the issues with searches.

Found an issue where the results controller is loaded twice. Have to figure out how to stop that so that the search doesn't take so long.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #278 from Jedwondle/master

Fixed some issues with the search