Rails 4 upgrade

will need to update .gitmodules to point to master on billing-engine