Merged branch 'rails4' into 'master'
Got rid of old rails 3.x and ruby 1.8 things.
Merge branch 'merge_rails4'