fixed a bug in the example jobfile; some cosmetic changes to the hVMC code
merged latest stuff from master