Update Django to 1.5.1 in tavis build.
Clear paymentInProgress when there's an error.
Add error message to payment page when there's an error.
Change field street to address in payment profile.
Merge pull request #331 from benkonrath/some-payment-fixes

Some payment fixes
Merge branch 'master' of github.com:onepercentclub/bluebottle
WIP: edit member settings
WIP: edit member settings
WIP: edit member settings (Added link to blog post discussing Ember data transactions)
WIP: edit member settings (Styling form)
Merge pull request #332 from prashantpalikhe/memburrprofile

Edit member settings.

This is still a work in progress but it's ready to go in.
Setup bluebottle_salesforce template for Stevano.
Merge pull request #333 from benkonrath/salesforce-setup

Setup bluebottle_salesforce template for Stevano.
Disable django-salesforce tests in jenkins.
Merge branch 'master' of github.com:onepercentclub/bluebottle