Updated Gemfile and rubocop fixes