fixed manage.py file
fixed url files to be django 1.6 compatible
fixed template url syntax to be django 1.6 compliant
fixed authentication in views.py
rebased and removed shopify_settings.py changes
rebased and removed shopify_settings.py changes
Update shopify_settings.py
edited views.py with finalize method on shopify's repo. This gets rid of the mergedict error in issue #7.
fixed manage.py file
fixed url files to be django 1.6 compatible
fixed merge issue in shopify_app/views.py
commit before rebase merge
Merge pull request #8 from JoeReis/master

Made some incremental fixes to make app Django 1.6 compliant