Merge pull request #350 from dshurt/master

Master
Modifications to scripts with latest code update (a lot of search issues fixed, OpenAM redirect loopback issue fixed removed code)
Merge pull request #351 from blaine-O/master

Modifications to scripts with latest code update (a lot of search issues...
Added better watch support handling.
Merge branch 'master' of https://github.com/di2e/openstorefront