Openstack merge
Cleanup
Merge pull request #21 from dmurtari/openstack

Support for benchmarking on OpenStack platforms