CV as of september 2012. Tweaks to template and Makefile