FF: better packaging scripts for versions repository
Merge branch 'master' of github.com:psychopy/psychopy

Conflicts:
	psychopy/tools/versionchooser.py