rebased and removed shopify_settings.py changes