Merge pull request #67 from mikeneiderhauser/master

Reduced size of node_mgmt step 1
Merge remote-tracking branch 'upstream/master'