New amps
Two lamps join the amp slot at Naima's shop. Both light the cells around them, both need a source touching them.
Lavalamp. 1x2, reach 2, about twice the boost of a Bulb.
Table Lamp. 2x2, reach 3, about four times the boost of a Bulb.
Minor fixes and cleanup.