Switch to the new MachineTemplate style of adding machines.
Switch to the new MachineTemplate style of adding machines.

It turns out the Environment life changes actually break us *again*, but I
think this code as it exists is correct, and that is a separate bug.

macgreagoir/juju,reedobrien/juju,davecheney/juju,Altoros/juju-vmware,mjs/juju,davecheney/juju,tsakas/juju,sinzui/juju,macgreagoir/juju,axw/juju,cloud-green/juju,mhilton/juju,frankban/juju-tmp,AdamIsrael/juju,macgreagoir/juju,frobware/juju,voidspace/juju,macgreagoir/juju,Altoros/juju-cloudsigma,reedobrien/juju,rogpeppe/juju,bogdanteleaga/juju,tsakas/juju,mikemccracken/juju,mattyw/juju,gabriel-samfira/juju,bogdanteleaga/juju,marcmolla/juju,axw/juju,cherylj/juju,dimitern/juju,frobware/juju,gabriel-samfira/juju,perrito666/juju,perrito666/juju,Altoros/juju-cloudsigma,bz2/juju,Altoros/juju-cloudsigma,tych0/juju,anastasiamac/juju,Altoros/juju-cloudsigma,dimitern/juju,cloud-green/juju,bac/juju,frankban/juju-tmp,dooferlad/juju,frankban/juju-tmp,gabriel-samfira/juju,bz2/juju,reedobrien/store,makyo/juju,Altoros/juju-vmware,kat-co/juju,voidspace/juju,ericsnowcurrently/juju,frankban/juju,marcmolla/juju,marcmolla/juju,bz2/juju,mjs/juju,davecheney/juju,sinzui/juju,waigani/juju,AdamIsrael/juju,howbazaar/juju,marcoceppi/juju,kat-co/juju,marcmolla/juju,wwitzel3/juju,mhilton/juju-juju,kat-co/juju,howbazaar/juju,mhilton/juju,bz2/juju,reedobrien/juju,howbazaar/juju,tych0/juju,rogpeppe/juju,cmars/juju,marcoceppi/juju,cmars/juju,dooferlad/juju,mhilton/juju,mattyw/juju,gabriel-samfira/juju,bac/juju,cloud-green/juju,tasdomas/juju,reedobrien/juju,mjs/juju,mhilton/juju-juju,tasdomas/juju,cherylj/juju,bac/juju,frobware/juju,mjs/juju,bogdanteleaga/juju,jrwren/juju,alesstimec/juju,gabriel-samfira/juju,dooferlad/juju,marcoceppi/juju,makyo/juju,dimitern/juju,anastasiamac/juju,axw/juju,tsakas/juju,makyo/juju,rogpeppe/juju,bz2/juju,frankban/juju,marcoceppi/juju,anastasiamac/juju,frankban/juju,thomnico/juju,sinzui/juju,anastasiamac/juju,tych0/juju,axw/juju,dooferlad/juju,AdamIsrael/juju,kat-co/juju,mikemccracken/juju,wwitzel3/juju,howbazaar/juju,dimitern/juju,mikemccracken/juju,waigani/juju,jrwren/juju,tasdomas/juju,perrito666/juju,thomnico/juju,alesstimec/juju,tych0/juju,macgreagoir/juju,frankban/juju,davecheney/juju,mhilton/juju-juju,wwitzel3/juju,dimitern/juju,jrwren/juju,cmars/juju,voidspace/juju,ericsnowcurrently/juju,bac/juju,alesstimec/juju,ericsnowcurrently/juju,cherylj/juju,ericsnowcurrently/juju,dooferlad/juju,frankban/juju-tmp,axw/juju,cmars/juju,mjs/juju,Altoros/juju-vmware,fwereade/juju,reedobrien/juju,howbazaar/juju,thomnico/juju,ericsnowcurrently/juju,AdamIsrael/juju,fwereade/juju,bogdanteleaga/juju,Altoros/juju-vmware,alesstimec/juju,waigani/juju,mjs/juju,fwereade/juju,cloud-green/juju,waigani/juju,tsakas/juju,sinzui/juju,mikemccracken/juju,mattyw/juju,mhilton/juju,anastasiamac/juju,mjs/juju,wwitzel3/juju,perrito666/juju,mattyw/juju,marcmolla/juju,perrito666/juju,fwereade/juju,voidspace/juju,bac/juju,makyo/juju,tasdomas/juju,kat-co/juju,mikemccracken/juju,frankban/juju,cherylj/juju,mhilton/juju-juju,alesstimec/juju,thomnico/juju