improve re capture of NS/VAL groups, inner funcs
Merge branch 'experimental'
Merge branch 'master' of github.com:nbargnesi/rest-api