Reworking some build steps in the absence of unvendored godep stuff
A few more build tweaks after godep changes
A round of cleanup in the Makefile

so that I'm sticking to my own rules around slim targets.