Rails 4, i18n and more fixes & changes

A bunch of fixes and changes (see messages for individual commits)