upgrade rails
Merge pull request #11 from perobertson/rails_upgrade

upgrade rails