#3 Improved autoload both for MakeGood and Travis.