Current coverage fsm timeouts arent' consistent with the way other
timeouts in riak work.  This change makes it so they're bounded
by the total time given by the init functions, rather than applying
their timeout to their waiting phases, which could be unbounded
if there are multiple calls to waiting_results.
Merge branch 'master' into pevm-coverage-timeout-refactor

Conflicts:
	src/riak_core_coverage_fsm.erl
Merge pull request #302 from basho/pevm-coverage-timeout-refactor

rework coverage fsm timeouts.