Merge pull request #414 from jackspirou/master

Updating paths from code.google.com/p/* to golang.org/x/*