Added ability to have a multi-character delimiter.  Also fixed escaped
delimiter support.  Included new tests for both cases.