BH - updated to the patch version of rails
Merge branch 'stripe_master' of github.com:electricgraffitti/castle into stripe_master