Fixing a number of golint issues.
Merge branch 'master' into replication
Linter fixes.
Better linter fixes.
Merge branch 'master' into replication
Merge pull request #260 from youtube/replication

Replication