Fixed some typos in the postprocessing code; lots of experimentation with amadeus matching
Merge branch 'devel' of github.com:markhuberty/psClean into devel