Fix Issue #136
Merge branch 'master' of https://github.com/Netflix/ribbon into cp
Upgrade mock version
Change the dependency on rxjava to a new format.
Merge pull request #137 from allenxwang/cp

Fix #136