These are some changes I made a while ago. I don't understand how they aren't in github - they seem to be pushed to production.

Committing so I can have a clean start.

Note - this is the first commit back under rr326 instead of under cloudant-labs.