Merge pull request #58 from nning/master

Updated rails (due to security issues in activesupport and sprockets).