Use new golang.org/x/... import paths.

See http://golang.org/s/go14subrepo.
Trim (unnecessary) trailing whitespace.
Merge pull request #10 from shurcooL/master

Use new golang.org/x/... import paths.