Update to rxjava 1.0.0.-rc7
Merge branch 'master' of https://github.com/Netflix/ribbon

Conflicts:
	gradle.properties
Update to Hystrix 1.4.0.-RC5 and eureka 1.1.142
Merge branch 'master' of https://github.com/Netflix/ribbon

Conflicts:
	gradle.properties
Merge pull request #184 from elandau/master

Update to rxjava 1.0.0.-rc7