Added support for filenames in cg.conf (they don't hook up yet). Fixed small issues in make generation.