Manually merge cookiecutter/main.py.
Manually merge cookiecutter/main.py.

benthomasson/cookiecutter,cichm/cookiecutter,hackebrot/cookiecutter,Springerle/cookiecutter,stevepiercy/cookiecutter,foodszhang/cookiecutter,nhomar/cookiecutter,sp1rs/cookiecutter,cguardia/cookiecutter,foodszhang/cookiecutter,kkujawinski/cookiecutter,takeflight/cookiecutter,letolab/cookiecutter,Vauxoo/cookiecutter,lgp171188/cookiecutter,cguardia/cookiecutter,dajose/cookiecutter,michaeljoseph/cookiecutter,tylerdave/cookiecutter,sp1rs/cookiecutter,vincentbernat/cookiecutter,christabor/cookiecutter,alex/cookiecutter,cichm/cookiecutter,drgarcia1986/cookiecutter,audreyr/cookiecutter,agconti/cookiecutter,nhomar/cookiecutter,venumech/cookiecutter,letolab/cookiecutter,agconti/cookiecutter,luzfcb/cookiecutter,terryjbates/cookiecutter,benthomasson/cookiecutter,jhermann/cookiecutter,moi65/cookiecutter,ionelmc/cookiecutter,Springerle/cookiecutter,lgp171188/cookiecutter,venumech/cookiecutter,atlassian/cookiecutter,janusnic/cookiecutter,atlassian/cookiecutter,audreyr/cookiecutter,willingc/cookiecutter,0k/cookiecutter,kkujawinski/cookiecutter,pjbull/cookiecutter,lucius-feng/cookiecutter,utek/cookiecutter,vintasoftware/cookiecutter,drgarcia1986/cookiecutter,ramiroluz/cookiecutter,michaeljoseph/cookiecutter,Vauxoo/cookiecutter,tylerdave/cookiecutter,alex/cookiecutter,utek/cookiecutter,vintasoftware/cookiecutter,luzfcb/cookiecutter,dajose/cookiecutter,lucius-feng/cookiecutter,0k/cookiecutter,pjbull/cookiecutter,terryjbates/cookiecutter,ramiroluz/cookiecutter,hackebrot/cookiecutter,vincentbernat/cookiecutter,takeflight/cookiecutter,stevepiercy/cookiecutter,ionelmc/cookiecutter,jhermann/cookiecutter,janusnic/cookiecutter,christabor/cookiecutter,willingc/cookiecutter,moi65/cookiecutter