Improvements to MATE environment discovery
Autodetect ml.conf location
Merge branch 'master' of https://github.com/jocisco/ml