Added stripe_id column to users, javascript and form for interacting with stripe.
fixed merge conflicts