fix merge for PR #80
fix merge for PR #80

robfletcher/SimianArmy,nvoron23/SimianArmy,pmcfadden/SimianArmy,danschaffer/SimianArmy,cnoffsin/SimianArmy,jgabrielfreitas/SimianArmy,manheim/SimianArmy,wgpshashank/SimianArmy,Ten48BASE/SimianArmy,harish143us/SimianArmy,genome21/SimianArmy,wizardofzos/SimianArmy,gorcz/SimianArmy,alfonsokim/SimianArmy,Yelp/SimianArmy,wizardofzos/SimianArmy,markmarco16/SimianArmy,alfonsokim/SimianArmy,lorengordon/SimianArmy,rspieldenner/SimianArmy,jgabrielfreitas/SimianArmy,DaveXiong/manic-monkey,ebukoski/SimianArmy,cnoffsin/SimianArmy,ebukoski/SimianArmy,rspieldenner/SimianArmy,gigugigu96/simianarmy,mgeis/SimianArmy,danschaffer/SimianArmy,markmarco16/SimianArmy,mgeis/SimianArmy,sgpal/SimianArmy,iixlabs/manic-monkey,priyanka-smitha/SimianArmy,nvoron23/SimianArmy,Netflix/SimianArmy,ksmaheshkumar/SimianArmy,tusharm/SimianArmy,sgpal/SimianArmy,pmcfadden/SimianArmy,jordancalder/SimianArmy,DaveXiong/manic-monkey,robfletcher/SimianArmy,priyanka-smitha/SimianArmy,Ten48BASE/SimianArmy,rberrelleza/SimianArmy,trmiller/SimianArmy,gorzell/SimianArmy,gorcz/SimianArmy,trmiller/SimianArmy,lantrix/SimianArmy,manheim/SimianArmy,dx-pbuckley/SimianArmy,genome21/SimianArmy,rhoml/SimianArmy,gorzell/SimianArmy,rberrelleza/SimianArmy,iixlabs/manic-monkey,xebia-france/SimianArmy,lorengordon/SimianArmy,Yelp/SimianArmy,iixlabs/manic-monkey,lantrix/SimianArmy,gigugigu96/simianarmy,coryb/SimianArmy,ksmaheshkumar/SimianArmy,wgpshashank/SimianArmy,jordancalder/SimianArmy,Netflix/SimianArmy,coryb/SimianArmy,dx-pbuckley/SimianArmy,harish143us/SimianArmy,rhoml/SimianArmy,tusharm/SimianArmy