Merge pull request #261 from adaptivecomputing/master

Merge master into dynamic nodes
Merge pull request #262 from adaptivecomputing/feature/dynamic-nodes

Merge pull request #261 from adaptivecomputing/master