Fix misspelled elb metric name; Default to zero when a stat is not available
Add support for breaking queue collection by vhost.
Prefix vhosts metrics with 'vhosts'

Add a "vhosts" prefix to the metric key so that it's easier to differentiate from other base level metric keys (ie, message_stats, object_totals, and queue_totals.)
Merge pull request #542 from analogue/elb-default-to-zero

Emit a value of zero when an ELB metric has no activity
Merge pull request #543 from oswell/master

Add support for breaking queue collection by vhost.
PEP8
rename postgre collector IdleInTransactions metric

so it doesn't clobber the LongestRunning metric
improvements for RPM packaging
exclude test directories from sdist releases
exclude test directories from deb package
update debian package to use pybuild
allow for diamond binaries to be in directories other than /usr/bin
fix path, start-stop-daemon doesn't use $PATH
Merge pull request #547 from ImmobilienScout24/feature/rpm_improve

improvements for RPM packaging
Merge pull request #550 from 50onRed/fix_upstart_path

Fix upstart path
move script specification for rpm into setup.cfg

One problem with specifying it only in the Makefile, is that it becomes
cumbersome to invoke 'python setup.py bdist_rpm' since many options are needed.
This change simplifys building RPMs and allows easier building w/o using the
Makefile. Building RPMs via the Makefile remains intact.
Updated elasticsearch.py url for local node stats

Compatible with Elasticsearch v0.90 and v1.0.
expose problem with cpu normalization when using psutil
fix cpu normalization when using psutil
Merge pull request #546 from sanga/patch-1

rename postgre collector IdleInTransactions metric