removed dummy settings for heroku
removed memcahe addon
changed image kit strategy to check for file before displaying
use traceback for import wp on heroku
bumped image kit version to prevent long cache key image problems
Revert "changed image kit strategy to check for file before displaying"

This reverts commit d4372e971edfaf45917a31f6e9b7715866e1a319.
removed debug in dev settings
Revert "Removed thumbnail from artist detail template"

This reverts commit bacd704c7a63bfc616cdc8e3aae2ab0163f81072.
Revert "Removed sorl-thumbnail from installed apps"

This reverts commit 9224b94c568b8bc0995ecd0ab3220922b3f6ffba.

Conflicts:
	configs/settings/common.py
Revert "Use django-simpleimages"

This reverts commit 24ef6bf4d18b9a006774ed0c142a7b8e0ff24748.

Conflicts:
	apps/photos/models.py
	configs/requirements/common.txt
	configs/settings/common.py
dev allow all hosts
debug toolbar always run on dev
use s3 for dev
remove javascript sentry support
Merge branch 'refs/heads/thumbnail'
Fixed image thumbnails
Merge branch 'master' of github.com:saulshanabrook/django-canadanewyork