DOCS: changelog and version bump
Merge branch 'master' of github.com:psychopy/psychopy