Fix logic in setup/running of Hadoop jobs and setuponly setting
Cleanup magpie-run logic
Re-work instructions given to users