Add timeouts to 2i queries
Merge pull request #108 from basho/gh610-2i-timeout

Add timeouts to 2i queries