Revert "change paths back to my fork"

This reverts commit d7c6cc674a2d9942a2a686ffa23716c6abe916d1.

Dependency on shutej's doesn't seem right.
(And fix a compile error in /client.go)