Added an optional token parameter to the subscribe method, which allows you to subscribe a user in one step
Added total_amount @property to CurrentSubscription model
Sync attempt_count to attempts field on Invoice
Sorting these in alphabetical order
Fixing bug where event signal handlers will still be able to access the old plan even after it has been deleted
Merge branch 'master' of github.com:eldarion/django-stripe-payments into bug/credit-card-updates
Fixing empty docstring
Pylint lines too long fixes
Disabling Meta class warning - not sure why this wasn't working before.: 'Old-style class defined.'
Disabling line too long for test module
Removing deprecation warnings (coming from pylint) and also altering the Meta warning to suppress for different versions of Python being used with pylint
Removing deprecation warnings for pylint
Whoops - replacing disable-msg with disable
See if this satisfies the test matrix - removing warnings for statement
Needed to put the warning suppression on the function line instead the statement where the delete takes place
Merge pull request #95 from fredpalmer/bug/customer.subscription.deleted-signal

Downstream signal handlers may still see stale subscription object properties when subscriptions are deleted
Merge pull request #90 from davegaeddert/invoice-sync-attempts

Sync attempt_count to attempts field on Invoice
Merge pull request #89 from davegaeddert/current-subscription-total

Added total_amount @property to CurrentSubscription model
Merge pull request #87 from oysterbooks/subscribe-with-token

Subscribe with a token
Merge branch 'master' of github.com:eldarion/django-stripe-payments into bug/credit-card-updates

Conflicts:
	payments/tests/test_commands.py
	payments/tests/test_customer.py
	payments/tests/test_email.py