Overwriting masterlist.yaml with copy from Sharlikran

For some reason the merge didn't take place as I thought.  Being new to
Git not sure what it was.  Sorry for the large commit.