update gems to allow use of user_id method on TokenData in current_user
sanitize params in with_params method so that ActiveModel stops yelling at me