update to rails4
Merge branch 'master' of https://github.com/bay6/railscasts