Bring in line with Python 1.6.0 - add sample and annotation resources.

You are right. It doesn't have to be in client.rb. In commit bd13d8a I've moved this into the sample resource.