Backport: Updating goyaml to gopkg.in path for bugfix.

Conflicts:
	bundledata.go
	charmarchive_test.go
	meta.go