Fixed rebasing gaff
GslOptimizer test now also runs Nelder-Mead