Removed accidental recursive description on matcher
Reworded failure messages in matcher
Upgraded matcher to use more current failure_message signature