Add pb_timeout_general and http_timeout_general options to basho_bench_driver_2i.erl
Merge pull request #89 from basho/slf-2i-driver-timeout

Add pb_timeout_general and http_timeout_general options to basho_bench_driver_2i.erl