update to rails 4
Merge branch 'master' of github.com:drumusician/starterapp_rails4