Avoid problems with "--" in func names by using ";" as internal delimeter

We know ";" is safe because it's the primary input delimiter.
Merge pull request #16 from timbunce/flowdelim2

Avoid problems with "--" in func names by using ";" as internal delimeter