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