Fix old puppet var syntax
Allow unicorn bins that live in shims.