update to latest rails
Merge branch 'master' of github.com:tetious/TuneZombie