Merge changes made to build the working CV generator

Benjamin Mako Hill || Want to submit a patch?