Merge Dist Zilla into Masater