fix up a merge conflict, and some trailing whitespace cleanup
s1543: add back range parameter to Client.open

range was removed from Client.open() in 2cd3e20506e07c19 but
we appear to need it.
Merge branch 'random_access' into s1543
s1543: fix range parameter order, add to recursive call
Merge pull request #25 from edwardchapin/s1543

S1543  so Ed can get on with stuff.