Merge pull request #220 from jrperritt/os-blockstorage

OS blockstorage v1