Make everything go get friendly

Signed-off-by: Saggi Mizrahi <ficoos@gmail.com>