Commiting changes to FileMaster, and consequences.
Changing command line to use -p and -c options.
Merge branch 'devel' of github.com:/dmorse/simpatico into devel