disk.py: added a reference to the host node.  Changed how I was assigning properties to avoid looping through all partitions every time. Cleaned up some debug stuff.
resolving merge conflict