Committing Marc's cleanup of beaver config files