Remove klass from Matador (finally)

Hello @nicks, @vinibaggio, 

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

44870f164865bd3d19c4ec3bba820bcd6d78c5fd (2014-04-04 12:48:00 -0700)
Remove klass from Matador (finally)

R=@nicks
R=@vinibaggio