I'm checking in a few updates. I've also created app-config/master_parser so that Avinaba Roy can begin placing the automatic include file handling (master_parser) code there for now.