Merge pull request #409 from dshurt/master

Master
Learned (the hard way) not to put code outside of describe/ it functions as it executes prematurely before the rest of the suite of scripts.  FINALLY fixed the problem!
Merge pull request #410 from blaine-O/master

Learned (the hard way) not to put code outside of describe/ it functions...
Added some missing api calls
Merge branch 'master' of https://github.com/di2e/openstorefront