missed a couple of things we needed for resolving the merge
missed a couple of things we needed for resolving the merge

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