updated for rails 4 and ruby 2
Merge branch 'rails4'