Merge pull request #19 from stronk7/master

MDLSITE-3422 ci: Various improvement to smurf files