Merge branches 'avoid-linking', 'profiling-in-parallel', 'flush-stdout' and 'dont-touch-files' into nh2work