Fixed sh/bash bug noted by Scott Sinno@NASA, updated setup script