rails update to 4.0.4
Merge branch 'rails404'