I ended up buying most of the major parts here:
Adafruit Industries, Unique & fun DIY electronics and kits
I got the latest revision of the Uno, a new soldering iron and 60/40 tin lead solder, some 22 gauge wire and 4 buttons. I also purchased their multicolor LCD.
I'm going to find the resistors locally and buy the transistor and diodes from another location, will update as I go and probably turn this into a build log.