Rewrite end_start_regex a bit more
Rewrite end_start_regex a bit more

The two major branches of the regex are now unified with the intention
of having it work in a more general case.

trafodion/vim-setup,trafodion/vim-setup