Merge pull request gogo#528 from jmarais/mergeaa810b6

Mergeaa810b6

fix gogo#427 consistent import naming between the import declaration …

…and the vars in grpc

* consistent import naming between the import declaration and the vars. This is more consistant with golang/protobuf. 

* moved issue427 test to the 'testall' make target to avoid grpc/context dependency

fix build by regenerating everything

merge 925541529c1fa6821df4e44ce2723319eb2be768 from golang/protobuf

Merge pull request gogo#343 from gogo/nounsafe

No unsafe

skip unsafe tests for bigendian architectures. (gogo#272)

* skip marshal and unmarshal tests on big endian architectures if message has generated unsafe methods

* equal and compare tests now also check for bigendian architectures when the message uses the unsafe marshaler or unmarshaler

* skip packed unsafe issue21 if cpu is not little endian

Updateded Readme: formatting

fix for issue 158

Merge pull request gogo#97 from tamird/protoc-gen-combo-errors

Make `protoc-gen-combo` actually report errors