Couple loading changes
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout