Cleanup
Merge branch 'master' of https://github.com/di2e/openstorefront
Cleanup
Merge pull request #407 from blaine-O/master

More Cleanup