Merge pull request #1 from hinesmr/master

QEMU scraper support and additional host monitoring bug fixes
Merge branch 'upstream'