Merge pull request #25 from cyrille-leclerc/master

Use jmxtrans-agent 1.0.4 and configure ever-increasing-counters as type="counter"