Clean up commented code, dead code
Merge branch 'master' of https://github.com/ankel/jmxdatamart.git