Rebase + resolve conflicts on PR #33 (sq-lcw.5 budget)#36

philcunliffe wants to merge 5 commits into

masterhyparam/squirreling:masterfrom

integration/batch-executionhyparam/squirreling:integration/batch-executionCopy head branch name to clipboard