updated rails, fixes #388
Merge branch 'master' of github.com:hacken-in/website