Fix guardfile
Merge branch 'master' into instrumentation

* master:
  Fix guardfile
cleanup instrumentation in railtie