Difficult and sloppy merge from old pupet branch

I moved around a LOT of directories.  There was no need to have any of
my configuration files in the project's root directory.  I'm going to
start managing things with puppet, so the configuration information will
live in the puppet modules.

The difficult part was getting all of the submodules move about.

I'm not going to bother with merging these changes into the old puppet
branch.  That would probably go HORRIBLY wrong.  I'm going to delete
that branch (locally and remotely) and start fresh from this point.