Merge pull request #25 from pandemicsyn/dev

Merg dev to master
Merge pull request #26 from pandemicsyn/dev

Dev
Add basic graphite/diamond support

Not yet configurable - assumes you're using diamond to push metrics to
graphite.