TESTS: further checks of optional dependencies (for jwp only)
TESTS: code clean-up for test_fitFunctions
Merge branch 'master' of github.com:psychopy/psychopy
DOCS: updated changelog. Removed eyetracker component from Builder for release
FF: reinstated use of `guess` for curvefit