Merge branch 'trunk' of https://github.com/jwk404/libcloud into jwk404-trunk