Change imports to use gopkg.in
More gopkg.in support - gopkg.in apparently doesn't like underscores in package names