NCI updates

* NCI "RegionOne" to Context.
* StorageAPI updates
* Adding Terry's Machine