Fixed a bug in phrase argument substitution.  After substituting an arg it wasn't skipping over the stuff that was substituted.
Adding to regression tests.
Merge branch 'feature/auto-insert-seperators' into develop