fixing weird 404 page setup
When in Rome...

I'm still not sure what that means.
Merge remote-tracking branch 'base/master'