Personal/vagrant puppet composer changes

Various changes around composer, vagrant and puppet.