makefile and ullong
Merge branch 'parallel_mc' into real_rates