updated staq tpl with latest bug fix, minor cleanup throughout

Signed-off-by: Alex McCaskey <mccaskeyaj@ornl.gov>
1 job for master in 13 minutes and 14 seconds (queued for 1 second)