Feature/new matchers

Hi, 

I did the update for the #71 as promised.
This merge request introduces backward incompatibility with old cassettes, but I think it's worth it. 

Improvements which I think should be done:
1.  `url` matcher could be removed on on favor of `uri` . (I left just for backward compatibility)
2. More integration and unit test should be added (I will do this after discussion of this pull request)

Looking forward for review.
Max