Merge pull request #274 from adaptivecomputing/master

Merge master back into dynamic nodes.