Improve error logging in sentry for celery workers.
Merge pull request #35 from pmclanahan/better-error-logging

Improve error logging in sentry for celery workers.
Fix exceptions when no welcome requested and text format.

Sentry showed us exceptions in the update_user task
were being caused when no welcome was requested and
the email format was set for text. This is because
welcome would be None, yet we still tried to append
'_T' to it. DOH!
Fix issue when unsubscribing from all newslettes.
Capture args and kwargs sent to tasks when they error.

And send this information to Sentry. This is instead of
just logging the exception.
Fix excess logging.
Merge pull request #38 from pmclanahan/capture-task-args-in-exceptions

Capture args and kwargs sent to tasks when they error.
Remove manual sentry logging.

It was duplicating what the celery helper was
doing, and not even as well. It was also masking
the source of the real errors.
Bug 827575 Don't change newsletter dates

Don't change newsletter timestamps in ET when we're not changing the
user's subscription. Change Basket to not send subscribe for
newseltters already subscribed to, or unsubscribe for newsletters not
subscribed to.
Add cache settings to GETable views
Merge pull request #40 from dpoirier/never-cache
Merge pull request #39 from dpoirier/bug-827575-dont-change-newsletter-timestamp-unnecessarily

Bug 827575 Don't change newsletter dates
Remove manual sentry capture.

Seems to be causing problems in reporting.
Bug 871764: Fix errors causing subscriptions to fail.
Merge pull request #41 from pmclanahan/fix-error-on-get-user-data-bug-871764

Bug 871764: Fix errors causing subscriptions to fail.
Only change user format preference on request

If an update_user call didn't specify a preference for email format
(T or H), Basket was defaulting to 'H', then setting that in ET
even if the user had previously selected 'T'.

Instead, don't send ET a format if the API call didn't specify one.
We still use the user's previous preference, if any, for sending
their welcome messages, or else HTML.
Merge pull request #45 from dpoirier/bug-overwriting-user-format-preference
Merge branch 'master' into django-1.5

Conflicts:
	basket/settings/base.py
	manage.py
	news/tasks.py
	settings_ex.py