Update dependencies to pull in new repos with licensing fixed
Merge pull request #21 from wallyworld/licence-fixes

Update dependencies to pull in new repos with licensing fixed
Updated mgo import paths for 1.20 branch
Merge pull request #30 from mjs/1.20-mgo-imports

Updated mgo import paths for 1.20 branch
Backport: Updating goyaml to gopkg.in path for bugfix.

Conflicts:
	bundledata.go
	charmarchive_test.go
	meta.go
Merge pull request #41 from katco-/1.20

Backport: Updating goyaml to gopkg.in path for bugfix.
Switch missed goyaml import to new gopkg.in/yaml.v1 location
Merge pull request #48 from bz2/gopkg_yaml

Switch missed goyaml import to new gopkg.in/yaml.v1 location