Add Canon CanoScan LIDE 20 and Canon CanoScan LIDE 30 to the list of supported devices.  While I'm there add CanoScan to the names of other Canon scanners.
Add Canon CanoScan LIDE 20 and Canon CanoScan LIDE 30 to the list of
supported devices.  While I'm there add CanoScan to the names of other
Canon scanners.

MFC after:	1 week

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase