Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Updating goyaml and goamz versions to latest.
Merge pull request #513 from katco-/import-goamz+goyaml

Import goamz+goyaml

To support:
https://bugs.launchpad.net/juju-deployer/+bug/1243827
https://bugs.launchpad.net/goamz/+bug/1319475