add shutdown option, minor touchups from lab testing
Authored by: brutzman 2011-05-30
Parent: [r602]
Child: [r604]