Modify Instrumentation -- based off of PR 175

Based off: https://github.com/rackerlabs/blueflood/pull/175/files

Added one more commit to fix NPE issue: 722f3c0