Reverted stringtoken to use original regex.  Fixes #12 but reopens #10