Merge pull request #1 from berghaus/master

Fix meta-data retrieval for OpenStack clouds