Merge pull request #1 from paranoidgabe/master

Update
Merge pull request #2 from paranoidgabe/master

update
Merge pull request #3 from paranoidgabe/master

Update
Update
Merge pull request #1 from ThunderOrg/master

Updated compute node stuff