Use canonical URLs
Merge branch 'master' of github.com:joyent/imagetools