To Upload to Main Site Tomorrow

Pending a few questions, here is the fixed version of everything we've
been working on.  Everything should be good, but I'll be editing and
changing things throughout the week as well, but just so we have
something better up on the site.