Revert "Set computron as our logs/tables server."

This reverts commit 2c68549d12e65131819a2f67bec58a830e3e9cdd.
Sets cmake cross defaults back to lab settings
Updates make cross options one more time
Merge pull request #575 from joshimhoff/master

Adjusts scripts and cmake stuff for the lab