Restored the protogeni code, removed all of the commented out code, and restored the original indentation to sections that lost it.
Restored the protogeni code, removed all of the commented out code,
and restored the original indentation to sections that lost it.

nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome,nmc-probe/emulab-nome