Go 1.0 build fix.
Merge branch 'master' of github.com:agl/pond