Add timeout option for 2i requests from Riak 1.4.1.

<del>Note that this does not include a new test, except for checking validation of the timeout value. I attempted to provoke the timeout but was unable to, even for 20K objects with a timeout of 1ms.</del> (fixed in second commit, discovered other bugs)