package_ensure + bring up to date

Bring in the changes that we're currently running, plus add my `package_ensure` branch.