Random code clean up; Bump braintree-rails version