Add pb_timeout_general and http_timeout_general options to basho_bench_driver_2i.erl
Added pre and post hooks
Allowing pre_hooks to start applications prior to basho_bench.

Pre_hooks may start crypto ahead of basho_bench.  This patch
allows basho_bench to continue in the event crypto is already
started.
Add counter ops to pb driver
Add an example for benching counters
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
Merge pull request #91 from oferrigni/pre_post_hook

Added pre and post hooks
Merge pull request #93 from bearstech/master

Benching Carbon, from Graphite project
Address review comments (s'not random, is uniform)
Merge branch 'rdb-counters'

Conflicts:
	src/basho_bench_driver_2i.erl