Merging back, afraid I may have to start over with Rails 3.x instead of 4