Clean up matador dependencies and peg to a known version

Hello @nicks, 

Please review the following commits I made in branch 'dpup-packages'.

dfff2e0331070e572cea81b65a778f326e85cd2d (2014-02-13 13:01:06 -0800)
Clean up matador dependencies and peg to a known version

R=@nicks
VISIBLE_CHANGES=\