Minor changes to the adaptor for the machine learner, and new file output features
Merge remote-tracking branch 'origin/master'