Some fixes for Go 1.4.

This should fix https://github.com/youtube/vitess/issues/274.