Merge branches 'master' and 'mtpt' of github.com:ScottDuckworth/psync into mtpt
start work on converting to mtpt