Put your atmega on a socket, or socket strip, then plug it back into your Uno for programming.
http://www.dipmicro.com/store/ICS328
http://www.dipmicro.com/store/HDR40X1FM
This place also has 16MHz crystal, 22pF caps, 100nFcaps, 10K pullup resistor for the reset pin.
All the pieces on the lower left are the 'arduino' bits on a little board I made up.
I have a 5V walwart for power, so no regulator is included, just a 100uF cap on the 2 pins where power comes in.