Fixed up randomized basin hopping stuff
Merging changes