Handle NIL delimiters
Merge pull request #27 from asutherland/nil-folder-delim

Handle NIL delimiters