Updates for puppet 3.2 compatability && Allow overriding the distro and add dependency repo