allow vpc-id, zone and subnet-id options for ec2
allow vpc-id, zone and subnet-id options for ec2

Signed-off-by: Evan Hazlett <7e61ed261aef9abaa71fd4c2127eb6cb9f01ce10@gmail.com>

carolynvs/machine,jpressnell/machine,anshulr/machine,dgageot/machine,deitch/machine,bdwill/docker.github.io,CenturyLinkLabs/machine,pdxjohnny/machine,Grynn/machine,usmanismail/machine,xiaohui/machine,13W/machine,s7v7nislands/machine,anweiss/docker.github.io,moxiegirl/machine,jzwlqx/denverdino.github.io,anweiss/docker.github.io,jeanlaurent/machine,whilp/machine,miqui/machine,carloreggiani/machine,docker/machine,joeuo/docker.github.io,pragkent/machine,docker-zh/docker.github.io,dweomer/docker-machine,gdevillele/docker.github.io,bgokden/machine,mjhea0/machine,miqui/machine,denmat/machine,sjfloat/machine,cpuguy83/machine,dudymas/machine,shot/machine,aduermael/docker.github.io,jeffellin/machine,johnstep/docker.github.io,ocean/machine,allingeek/machine,cab105/machine,Herbis/machine,menglingwei/machine,hypriot/machine,ksasi/machine,JohnKDay/machine,ibuildthecloud/machine,bdwill/docker.github.io,rawkode/machine,alindeman/machine,allingeek/machine,mark-adams/machine,askb/machine,Qwinix/docker-machine-vmware,otherjason/machine,vovimayhem/machine,LuisBosquez/docker.github.io,akolpakov/machine,atsaki/machine-2,ddaze/machine,imikushin/machine,docker/docker.github.io,robvanmieghem/machine,rupakg/machine,juliengarcia/machine,aidora/yont,pdxjohnny/machine,jsirois/machine,steeve/machine,ocean/machine,ekristen/machine,cgvarela/machine,bdwill/docker.github.io,bookerzzz/machine,thaJeztah/machine,slashk/machine,dhiltgen/machine,robinbb/machine,BSWANG/denverdino.github.io,sanscontext/docker.github.io,jkingyens/machine,ehazlett/machine,hironobu-s/machine,wzymaster/machine,SvenDowideit/machine,carloreggiani/machine,shin-/docker.github.io,denverdino/machine-1,paultag/machine,jlusiardi/machine,sanscontext/docker.github.io,jeanlaurent/machine,imikushin/machine,OpenNebula/machine,pottava/machine,surgeforward/machine,rillig/docker.github.io,davidstosik/machine,jeanlaurent/machine,dweomer/docker-machine,thaJeztah/docker.github.io,rillig/docker.github.io,dudymas/machine,yanzay/machine,anshulr/machine,chantra/machine,erikdejonge/machine,kacole2/machine,wlan0/machine,JohnKDay/machine,denverdino/denverdino.github.io,wlan0/machine,legal90/machine,allingeek/machine,dnephin/machine,skatsuta/machine,denverdino/docker.github.io,bfirsh/machine,thaJeztah/docker.github.io,dmp42/machine,TrumanLing/machine,bwahn/machine,faijaz/docker-machine,johnstep/docker.github.io,cvstebut/machine,chantra/machine,brandoncc/machine,rwilliams/machine,pottava/machine,aperepel/machine,cab105/machine,bwahn/machine,troy0820/docker.github.io,gdevillele/docker.github.io,JimGalasyn/docker.github.io,shin-/docker.github.io,trecloux/machine,sjfloat/machine,ubiquityhosting/machine,aduermael/docker.github.io,cpuguy83/machine,joyent/machine,JohnKDay/machine,gdevillele/docker.github.io,skatsuta/machine,marsmensch/machine,tyrken/machine,rowancarr/machine,soleo/machine,denverdino/denverdino.github.io,gerred/machine,joaofnfernandes/docker.github.io,ajoy123/docker-machine,skippbox/kmachine,usmanismail/machine,clintonskitson/machine,aduermael/docker.github.io,LuisBosquez/docker.github.io,denverdino/denverdino.github.io,exoscale/docker-machine,crunchywelch/machine,Grynn/machine,wenlock/machine,rillig/docker.github.io,paultag/machine,tyrken/machine,laveolu/machine,davidstosik/machine,docker-zh/docker.github.io,mjhea0/machine,hypriot/machine,atsaki/machine-2,joeuo/docker.github.io,databus23/machine,abstractitptyltd/machine,thaJeztah/docker.github.io,pragkent/machine,LuisBosquez/docker.github.io,voutilad/machine,wzymaster/machine,xinxian0458/machine,deitch/machine,emsi/machine,jsirois/machine,yut148/machine,Kast0rTr0y/docker-machine,johnstep/docker.github.io,cab105/machine,alexisbellido/docker.github.io,atsaki/machine,alexisbellido/docker.github.io,jlusiardi/machine,ubiquityhosting/machine,joaofnfernandes/docker.github.io,Parallels/docker-machine,mark-adams/machine,steeve/machine,jarosser06/machine,robvanmieghem/machine,denverdino/denverdino.github.io,joeuo/docker.github.io,TrumanLing/machine,voutilad/machine,denverdino/docker.github.io,sebadiaz/machine,ravolt/docker-machine,docker-zh/docker.github.io,ksasi/machine,rowancarr/machine,menglingwei/denverdino.github.io,pragkent/machine,danix800/docker.github.io,larsla/machine,StackPointCloud/machine,sjfloat/machine,carolynvs/machine,cvstebut/machine,rawkode/machine,joelea/machine,anweiss/docker.github.io,carolynvs/machine,xiaohui/machine,csakoda/machine,blueyed/machine,beni55/machine,denmat/machine,denverdino/docker.github.io,rowancarr/machine,trecloux/machine,wenlock/machine,joaofnfernandes/docker.github.io,joeuo/docker.github.io,jmelis/machine,rwilliams/machine,Qwinix/docker-machine-vmware,jasisk/machine,denverdino/docker.github.io,joelea/machine,denverdino/machine-1,jhoos/machine,bdwill/docker.github.io,johnstep/docker.github.io,clintonskitson/machine,trecloux/machine,LuisBosquez/docker.github.io,binario200/machine,jzwlqx/denverdino.github.io,euank/machine,denverdino/denverdino.github.io,dgageot/machine,jzwlqx/denverdino.github.io,thaJeztah/machine,tpires/machine,s7v7nislands/machine,joaofnfernandes/docker.github.io,JimGalasyn/docker.github.io,j3tm0t0/machine,amylindburg/machine,mjtrefethen/machine,danix800/docker.github.io,alexisbellido/docker.github.io,jkingyens/machine,zehicle/machine,titanlien/machine,mjtrefethen/machine,londoncalling/docker.github.io,jarosser06/machine,jpressnell/machine,jgsqware/machine,LuisBosquez/docker.github.io,docker/docker.github.io,zchee/machine,errordeveloper/machine,phiroict/docker,dskora/machine,atsaki/machine,CenturyLinkLabs/machine,LaynePeng/machine,xiaohui/machine,davidstosik/machine,londoncalling/docker.github.io,menglingwei/denverdino.github.io,ppadala/machine,ggiamarchi/machine,danix800/docker.github.io,phiroict/docker,aperepel/machine,seegno-forks/machine,cvstebut/machine,ubiquityhosting/machine,shin-/docker.github.io,dudymas/machine,sebadiaz/machine,feelobot/machine,rdgreis/machine,robertbreker/machine,bwahn/machine,bgokden/machine,brandoncc/machine,feelobot/machine,Grynn/machine,skatsuta/machine,londoncalling/docker.github.io,faijaz/docker-machine,seegno-forks/machine,jeffellin/machine,flavio/machine,slowteetoe/machine,kunalkushwaha/machine,titanlien/machine,databus23/machine,schatt/machine,Parallels/docker-machine,ksasi/machine,BSWANG/denverdino.github.io,docker/docker.github.io,shin-/docker.github.io,dnephin/machine,abstractitptyltd/machine,SvenDowideit/machine,robertbreker/machine,ibuildthecloud/machine,gdevillele/docker.github.io,emsi/machine,robinbb/machine,BSWANG/denverdino.github.io,StackPointCloud/machine,LaynePeng/machine,ppadala/machine,shubheksha/docker.github.io,rillig/docker.github.io,frapposelli/machine,miqui/machine,dskora/machine,troy0820/docker.github.io,unodba/machine,sebadiaz/machine,menglingwei/denverdino.github.io,errordeveloper/machine,robvanmieghem/machine,titanlien/machine,askb/machine,kunalkushwaha/machine,phiroict/docker,bfirsh/machine,asalhamed/machine,alindeman/machine,pdxjohnny/machine,hironobu-s/machine,NeilW/machine,shubheksha/docker.github.io,euank/machine,duglin/machine,BSWANG/denverdino.github.io,crunchywelch/machine,kunalkushwaha/machine,otherjason/machine,NeilW/machine,jhoos/machine,sanscontext/docker.github.io,londoncalling/machine,JimGalasyn/docker.github.io,jlusiardi/machine,shot/machine,phiroict/docker,justintung/machine,londoncalling/docker.github.io,databus23/machine,13W/machine,anweiss/docker.github.io,ravolt/docker-machine,rupakg/machine,menglingwei/machine,cjellick/machine,frapposelli/machine,marsmensch/machine,csakoda/machine,evq/machine,JimGalasyn/docker.github.io,akolpakov/machine,jkingyens/machine,zchee/machine,juliengarcia/machine,sean-brandt/machine,sanscontext/docker.github.io,thaJeztah/docker.github.io,juliengarcia/machine,kechol/machine,slashk/machine,thaJeztah/machine,tpires/machine,ehazlett/machine,shubheksha/docker.github.io,jmelis/machine,jgsqware/machine,rwilliams/machine,phiroict/docker,ajoy123/docker-machine,surgeforward/machine,docker/docker.github.io,ggiamarchi/machine,BSWANG/denverdino.github.io,exoscale/docker-machine,denverdino/docker.github.io,yanzay/machine,aidora/yont,askb/machine,kacole2/machine,shot/machine,ppadala/machine,moxiegirl/machine,wzymaster/machine,denverdino/machine,jasisk/machine,cgvarela/machine,bookerzzz/machine,jhoos/machine,docker/docker.github.io,Kast0rTr0y/docker-machine,MHBauer/machine,docker-zh/docker.github.io,whilp/machine,bookerzzz/machine,ekristen/machine,sausheong/machine,shubheksha/docker.github.io,sean-brandt/machine,hironobu-s/machine,aduermael/docker.github.io,gdevillele/docker.github.io,beni55/machine,danix800/docker.github.io,docker-zh/docker.github.io,thaJeztah/docker.github.io,shakamunyi/machine,errordeveloper/machine,OpenNebula/machine,bdwill/docker.github.io,binario200/machine,joeuo/docker.github.io,usmanismail/machine,Herbis/machine,unodba/machine,vovimayhem/machine,alexisbellido/docker.github.io,larsla/machine,alexisbellido/docker.github.io,beni55/machine,jeffellin/machine,menglingwei/denverdino.github.io,londoncalling/docker.github.io,erikdejonge/machine,legal90/machine,soleo/machine,soleo/machine,yut148/machine,MHBauer/machine,jgsqware/machine,zehicle/machine,joyent/machine,shakamunyi/machine,shubheksha/docker.github.io,robertbreker/machine,denverdino/machine,joaofnfernandes/docker.github.io,StackPointCloud/machine,jsirois/machine,ajoy123/docker-machine,kechol/machine,docker/machine,skippbox/kmachine,jmelis/machine,tyrken/machine,dhiltgen/machine,bgokden/machine,flavio/machine,jzwlqx/denverdino.github.io,londoncalling/machine,atsaki/machine,asalhamed/machine,duglin/machine,blueyed/machine,nunofgs/docker-machine,j3tm0t0/machine,gerred/machine,dmp42/machine,zchee/machine,troy0820/docker.github.io,slowteetoe/machine,rdgreis/machine,sanscontext/docker.github.io,tpires/machine,djfarrelly/machine,johnstep/docker.github.io,kacole2/machine,vovimayhem/machine,denverdino/machine,JimGalasyn/docker.github.io,anweiss/docker.github.io,faijaz/docker-machine,nunofgs/docker-machine,xinxian0458/machine,jzwlqx/denverdino.github.io,sausheong/machine,schatt/machine,OpenNebula/machine,menglingwei/denverdino.github.io,NeilW/machine,laveolu/machine,ddaze/machine,wenlock/machine,djfarrelly/machine,pottava/machine,xinxian0458/machine,otherjason/machine,gerred/machine,wlan0/machine,yanzay/machine,evq/machine,shin-/docker.github.io,moxiegirl/machine,menglingwei/machine,cjellick/machine,troy0820/docker.github.io,justintung/machine,amylindburg/machine