Pushing various changes.  Am trying to get a working copy that will run on Google AppEngine.