rails 4 upgrade, stripe, progress on cart, cleanups