Update some more gems
Remove unneeded 'therubyracer' dependency
Fix merge conflicts