Merge pull request #1 from DramaFever/upstream_master

Pull in changes from the upstream master
Change the go.image subrepo import path

Based on
https://groups.google.com/forum/#!msg/golang-nuts/eD8dh3T9yyA/l5Ail-xfMiAJ
all of the code.google.com/p/go.* subrepos are getting moved to
golang.org/x/* this commit points the
`code.google.com/p/go.image/tiff` to `golang.org/x/image
Merge pull request #2 from DramaFever/golang_subrepo_rename

Change the go.image subrepo import path
Merge pull request #18 from DramaFever/master

Change the go.image subrepo import path