Merge branch 'master' into feature/bursting (run by Brian Saville)
Merge branch 'feature/dynamic-nodes' into feature/bursting
Merge pull request #262 from adaptivecomputing/feature/dynamic-nodes

Merge pull request #261 from adaptivecomputing/master
Merge pull request #270 from adaptivecomputing/feature/dynamic-nodes

merge to Feature/dynamic nodes from bursting
Merge pull request #276 from adaptivecomputing/feature/bursting

Feature/bursting