Merge pull request #274 from adaptivecomputing/master

Merge master back into dynamic nodes.
Merge pull request #275 from adaptivecomputing/feature/dynamic-nodes

Merge pull request #274 from adaptivecomputing/master