Use forks
go get target in Makefile
Add forks as sources
Fix couple of lint warnings