Use golang.org/x/* over code.google.com/p/go.*.
Merge branch 'master' of github.com:limetext/text