Fix arg parsing for xpls, harder
Override Include to install templates early

The xpls header and footer need to be installed before we try to
evaluate them as templates in any later script processing
Merge branch 'augmaster'