Merge pull request #5 from dbeck/master

integrating diag.proto; setting downstream options in gyp