upgrade rails and gems
Merge pull request #397 from cantino/update_rails_and_gems

upgrade rails and gems