City strikes recycling deal that eliminates glass