tcollector.py: refactor the way adding default tags works, so for any line,
it will add the tags if they're not already present.
This allows for defaults that can be overridden in a collector.

Signed-off-by: Vasiliy Kiryanov <vasiliy.kiryanov@gmail.com>
iostat.py: add statistic metric svctm.
Signed-off-by: Vasiliy Kiryanov <vasiliy.kiryanov@gmail.com>
re-merge upstream master. keep divergence minimal
Merge remote-tracking branch 'upstream/master' into remerge-upstream
missed __init__.py
Merge pull request #13 from optimizely/remerge-upstream

re-merge upstream master. keep divergence minimal