Clean up matador dependencies and peg to a known version
Merge pull request #143 from Obvious/dpup-packages

Clean up matador dependencies and peg to a known version