Gyp cleanup.

* Point back to the joyent tree
* remove duplicate includes