A few more things cleaned up.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #150 from Jedwondle/master

Cleaned up a few more things.