Less messing with Gemfile is always better.
Unbreak Redmine building and running, and polish a bit more.
Should work now, any testers?