Fixes recommended by phinze for #2333
Fixes recommended by phinze for #2333

benizi/vagrant,h4ck3rm1k3/vagrant,modulexcite/vagrant,jean/vagrant,aneeshusa/vagrant,ferventcoder/vagrant,chrisroberts/vagrant,darkn3rd/vagrant,invernizzi-at-google/vagrant,muhanadra/vagrant,carlosefr/vagrant,tomfanning/vagrant,kalabiyau/vagrant,PatOShea/vagrant,shtouff/vagrant,apertoso/vagrant,gitebra/vagrant,jberends/vagrant,Chhed13/vagrant,mwrock/vagrant,mkuzmin/vagrant,kamazee/vagrant,bheuvel/vagrant,aaam/vagrant,doy/vagrant,justincampbell/vagrant,tomfanning/vagrant,Endika/vagrant,wangfakang/vagrant,tbriggs-curse/vagrant,jfchevrette/vagrant,myrjola/vagrant,janek-warchol/vagrant,jtopper/vagrant,jmanero/vagrant,apertoso/vagrant,myrjola/vagrant,channui/vagrant,sni/vagrant,johntron/vagrant,theist/vagrant,lukebakken/vagrant,Chhunlong/vagrant,aneeshusa/vagrant,otagi/vagrant,sideci-sample/sideci-sample-vagrant,jean/vagrant,TheBigBear/vagrant,petems/vagrant,TheBigBear/vagrant,genome21/vagrant,jtopper/vagrant,jfchevrette/vagrant,dhoer/vagrant,Chhunlong/vagrant,bshurts/vagrant,gitebra/vagrant,wangfakang/vagrant,senglin/vagrant,bshurts/vagrant,krig/vagrant,mwrock/vagrant,tbriggs-curse/vagrant,modulexcite/vagrant,h4ck3rm1k3/vagrant,crashlytics/vagrant,tjanez/vagrant,sni/vagrant,jhoblitt/vagrant,jkburges/vagrant,bshurts/vagrant,cgvarela/vagrant,petems/vagrant,bryson/vagrant,dharmab/vagrant,loren-osborn/vagrant,Endika/vagrant,benh57/vagrant,chrisroberts/vagrant,zsjohny/vagrant,blueyed/vagrant,gbarberi/vagrant,dustymabe/vagrant,tbarrongh/vagrant,petems/vagrant,pwnall/vagrant,tschortsch/vagrant,jtopper/vagrant,muhanadra/vagrant,sferik/vagrant,tbarrongh/vagrant,chrisvire/vagrant,tschortsch/vagrant,senglin/vagrant,crashlytics/vagrant,philwrenn/vagrant,Sgoettschkes/vagrant,tknerr/vagrant,stephancom/vagrant,taliesins/vagrant,nickryand/vagrant,mwrock/vagrant,pwnall/vagrant,kamigerami/vagrant,teotihuacanada/vagrant,legal90/vagrant,denisbr/vagrant,tjanez/vagrant,invernizzi-at-google/vagrant,p0deje/vagrant,chrisvire/vagrant,gajdaw/vagrant,gpkfr/vagrant,blueyed/vagrant,PatrickLang/vagrant,TheBigBear/vagrant,carlosefr/vagrant,justincampbell/vagrant,Endika/vagrant,bdwyertech/vagrant,blueyed/vagrant,BlakeMesdag/vagrant,chrisroberts/vagrant,dustymabe/vagrant,benh57/vagrant,PatOShea/vagrant,evverx/vagrant,channui/vagrant,carlosefr/vagrant,Chhunlong/vagrant,ianmiell/vagrant,modulexcite/vagrant,tomfanning/vagrant,sni/vagrant,channui/vagrant,tknerr/vagrant,krig/vagrant,kamigerami/vagrant,genome21/vagrant,miguel250/vagrant,bryson/vagrant,bdwyertech/vagrant,fnewberg/vagrant,iNecas/vagrant,kamazee/vagrant,mitchellh/vagrant,rivy/vagrant,senglin/vagrant,shtouff/vagrant,jberends/vagrant,denisbr/vagrant,invernizzi-at-google/vagrant,teotihuacanada/vagrant,stephancom/vagrant,krig/vagrant,legal90/vagrant,bheuvel/vagrant,jean/vagrant,tknerr/vagrant,fnewberg/vagrant,obnoxxx/vagrant,ArloL/vagrant,doy/vagrant,sax/vagrant,sferik/vagrant,legal90/vagrant,tschortsch/vagrant,senglin/vagrant,zsjohny/vagrant,stephancom/vagrant,lonniev/vagrant,sideci-sample/sideci-sample-vagrant,clinstid/vagrant,taliesins/vagrant,p0deje/vagrant,dhoer/vagrant,vamegh/vagrant,gbarberi/vagrant,denisbr/vagrant,genome21/vagrant,juiceinc/vagrant,darkn3rd/vagrant,janek-warchol/vagrant,Avira/vagrant,dustymabe/vagrant,shtouff/vagrant,teotihuacanada/vagrant,modulexcite/vagrant,zsjohny/vagrant,apertoso/vagrant,lukebakken/vagrant,johntron/vagrant,marxarelli/vagrant,Chhed13/vagrant,fnewberg/vagrant,h4ck3rm1k3/vagrant,janek-warchol/vagrant,carlosefr/vagrant,otagi/vagrant,mitchellh/vagrant,wangfakang/vagrant,johntron/vagrant,philoserf/vagrant,Ninir/vagrant,vamegh/vagrant,gbarberi/vagrant,muhanadra/vagrant,tomfanning/vagrant,lukebakken/vagrant,patrys/vagrant,lonniev/vagrant,myrjola/vagrant,ianmiell/vagrant,gpkfr/vagrant,PatrickLang/vagrant,rivy/vagrant,kalabiyau/vagrant,crashlytics/vagrant,jhoblitt/vagrant,jkburges/vagrant,wkolean/vagrant,benh57/vagrant,bshurts/vagrant,gpkfr/vagrant,tjanez/vagrant,mkuzmin/vagrant,kamigerami/vagrant,philwrenn/vagrant,juiceinc/vagrant,signed8bit/vagrant,BlakeMesdag/vagrant,jhoblitt/vagrant,jean/vagrant,jberends/vagrant,iNecas/vagrant,gitebra/vagrant,ianmiell/vagrant,tjanez/vagrant,MiLk/vagrant,mpoeter/vagrant,p0deje/vagrant,shtouff/vagrant,nickryand/vagrant,patrys/vagrant,MiLk/vagrant,otagi/vagrant,mkuzmin/vagrant,tschortsch/vagrant,tbriggs-curse/vagrant,darkn3rd/vagrant,obnoxxx/vagrant,jkburges/vagrant,vamegh/vagrant,ArloL/vagrant,jmanero/vagrant,marxarelli/vagrant,Avira/vagrant,jkburges/vagrant,wkolean/vagrant,petems/vagrant,philoserf/vagrant,sax/vagrant,jberends/vagrant,clinstid/vagrant,sax/vagrant,denisbr/vagrant,Avira/vagrant,bryson/vagrant,philoserf/vagrant,chrisvire/vagrant,MiLk/vagrant,rivy/vagrant,gajdaw/vagrant,jmanero/vagrant,dustymabe/vagrant,krig/vagrant,wkolean/vagrant,teotihuacanada/vagrant,Sgoettschkes/vagrant,darkn3rd/vagrant,philoserf/vagrant,BlakeMesdag/vagrant,Ninir/vagrant,jfchevrette/vagrant,benizi/vagrant,Chhunlong/vagrant,janek-warchol/vagrant,aneeshusa/vagrant,kalabiyau/vagrant,h4ck3rm1k3/vagrant,mwrock/vagrant,taliesins/vagrant,mwarren/vagrant,tbriggs-curse/vagrant,tbarrongh/vagrant,rivy/vagrant,TheBigBear/vagrant,mpoeter/vagrant,zsjohny/vagrant,apertoso/vagrant,cgvarela/vagrant,Chhed13/vagrant,loren-osborn/vagrant,miguel250/vagrant,legal90/vagrant,jhoblitt/vagrant,juiceinc/vagrant,miguel250/vagrant,signed8bit/vagrant,marxarelli/vagrant,mwarren/vagrant,lukebakken/vagrant,ArloL/vagrant,cgvarela/vagrant,stephancom/vagrant,chrisroberts/vagrant,fnewberg/vagrant,jmanero/vagrant,bheuvel/vagrant,dharmab/vagrant,doy/vagrant,genome21/vagrant,marxarelli/vagrant,wangfakang/vagrant,jfchevrette/vagrant,bdwyertech/vagrant,dhoer/vagrant,theist/vagrant,ferventcoder/vagrant,bheuvel/vagrant,kamazee/vagrant,otagi/vagrant,juiceinc/vagrant,Endika/vagrant,dharmab/vagrant,dhoer/vagrant,jtopper/vagrant,Ninir/vagrant,doy/vagrant,ferventcoder/vagrant,Sgoettschkes/vagrant,Chhed13/vagrant,PatrickLang/vagrant,pwnall/vagrant,myrjola/vagrant,crashlytics/vagrant,mkuzmin/vagrant,signed8bit/vagrant,blueyed/vagrant,sax/vagrant,dharmab/vagrant,mpoeter/vagrant,mitchellh/vagrant,gpkfr/vagrant,mwarren/vagrant,vamegh/vagrant,sferik/vagrant,Avira/vagrant,ferventcoder/vagrant,gbarberi/vagrant,ArloL/vagrant,aneeshusa/vagrant,mitchellh/vagrant,chrisvire/vagrant,tknerr/vagrant,lonniev/vagrant,bdwyertech/vagrant,kamazee/vagrant,mwarren/vagrant,clinstid/vagrant,PatOShea/vagrant,miguel250/vagrant,theist/vagrant,loren-osborn/vagrant,pwnall/vagrant,iNecas/vagrant,tbarrongh/vagrant,justincampbell/vagrant,johntron/vagrant,PatrickLang/vagrant,philwrenn/vagrant,cgvarela/vagrant,muhanadra/vagrant,benizi/vagrant,kalabiyau/vagrant,signed8bit/vagrant,nickryand/vagrant,PatOShea/vagrant,sni/vagrant,loren-osborn/vagrant,benh57/vagrant,mpoeter/vagrant,invernizzi-at-google/vagrant,patrys/vagrant,taliesins/vagrant,philwrenn/vagrant,gajdaw/vagrant,sideci-sample/sideci-sample-vagrant,aaam/vagrant,benizi/vagrant,evverx/vagrant,lonniev/vagrant,nickryand/vagrant,kamigerami/vagrant,aaam/vagrant,obnoxxx/vagrant,justincampbell/vagrant,Sgoettschkes/vagrant,theist/vagrant,ianmiell/vagrant,wkolean/vagrant,gitebra/vagrant,evverx/vagrant,aaam/vagrant,bryson/vagrant,patrys/vagrant