Rails 4 update

Preparing for public release
Better variable names