Don't blow-up on existing directories.
Merge pull request #107 from square/jw/existing-folder

Don't blow-up on existing directories.