Support reporting uptime in different time units as per metric_name
Fix NumaCollector unit test failure due to misconfigured 'bin' config
Fix unit test failure caused by incorrect pep8 cleanup in b6fab08
Add missing python package 'setproctitle' to travis requirements
Fix kafka unit tests

This was broken in cb2cd73. There is no longer a key prefix for JVM metrics.
Thus the metric names have changed and needed to be sanitized before reporting
Remove unused variable
Fix the default MX4J port to 8082
Remove use of check_output to maintain compatibility with python 2.6
Fix string format string to be compatible with python 2.6
Merge pull request #33 from jaingaurav/unit_tests

Fix Diamond unit tests
Support reporting uptime in different time units as per metric_name
Merge branch 'uptime_units' of https://github.com/jaingaurav/Diamond into uptime_units

* 'uptime_units' of https://github.com/jaingaurav/Diamond:
  Support reporting uptime in different time units as per metric_name
Merge pull request #32 from jaingaurav/uptime_units

Support reporting uptime in different time units as per metric_name