Adding coverage bits, plus cleaning up Godeps tree