Merge branch 'maintain'
Merge branch 'maintain'
Merge branch 'maintain'
Update capistrano deployment configuration
Merge branch 'maintain'
Update spree_dibs_referral to fix my account page