This modifies the MCMC code to allow simultaneous update of
all hierarchy levels, improving equilibration speed.

This also makes niter correspond to number of sweeps

This reverts commit df948de9.

As it turns out, some slightly older compilers (e.g. GCC 5.6) do not
like this.

This fixes issue #351