Added a maxRetries parameter to the convergence protocol to limit the
number of samples that can be taken without meeting the convergence
criteria
Merge branch 'develop' of ssh://git@github.com/tearne/Sampler.git into develop