Merge pull request #261 from adaptivecomputing/master

Merge master into dynamic nodes