Upgrade to rails4
Merge pull request #2 from psu-stewardship/rails4

Upgrade to rails4