Add disk stats to `/stats` output to make consistent

As pointed out by @fygrave in #285, `riak-admin status` shows
diak stats, but `/stats` does not. This fixes that.#285, `riak-admin status` shows
diak stats, but `/stats` does not. This fixes that.#285, `riak-admin status` shows
diak stats, but `/stats` does not. This fixes that.
Handle worker errors and timeout on 2i reformat

Before this fix, I noticed the reformat basically hang forever with a
crashed worker error once. This fix handles the error message from the
vnode worker and adds a big 2 minute timeout to make sure we don't get
stuck. In reality, it's mostly harmless, but annoying to leave a process
hanging forever like that.
Merge pull request #383 from basho/rdb-eq-stats-status

Add disk stats to `/stats` output to make consistent
Merge pull request #561 from basho/eas-2i-reformat-handle-error

Handle worker errors and timeout on 2i reformat
Remove -author attributes

They aren't kept current and the same information can be ascertained
from git.
Merge pull request #603 from basho/rz-remove-authors

Remove -author attributes
resolve author attribs conflict
Merge branch 'pevm-r16-compat2' of github.com:basho/riak_kv into pevm-r16-compat2