Updates to PUG and tests
Merge pull request #2 from skearnes/scripts

Updates to PUG and tests