Fixed bug with rake assets:precompile

Looks like my merge messed up the redmine tracker code a bit. Also, the
Gemfile changed significantly in upstream so I just copied over the new
rails version and ran bundle install.