Merge branch 'master' of ssh://john@cellform.com/home/john/Development/pspp-selector