Fix #2214 -- handle nikola init in existing dir nicely
Fix #2214 -- handle nikola init in existing dir nicely

Signed-off-by: Chris Warrick <de6f931166e131a07f31c96c765aee08f061d1a5@gmail.com>

x1101/nikola,wcmckee/nikola,xuhdev/nikola,x1101/nikola,gwax/nikola,knowsuchagency/nikola,xuhdev/nikola,xuhdev/nikola,s2hc-johan/nikola,getnikola/nikola,knowsuchagency/nikola,okin/nikola,okin/nikola,knowsuchagency/nikola,okin/nikola,atiro/nikola,andredias/nikola,getnikola/nikola,okin/nikola,s2hc-johan/nikola,wcmckee/nikola,atiro/nikola,wcmckee/nikola,atiro/nikola,getnikola/nikola,xuhdev/nikola,andredias/nikola,getnikola/nikola,gwax/nikola,x1101/nikola,s2hc-johan/nikola,gwax/nikola,andredias/nikola