Make rio.c comment 80-columns friendly.
Test: remove useless statements and comments from test default config.
Merge remote-tracking branch 'antirez/2.6' into rdio-2.6