Gemfile cleanup and upgrades