Merge pull request #32 from johncowie/master

Fixed instrumentation
Added suite of wrapper functions for instrumenting jvm metrics
Merge remote-tracking branch 'upstream/master'