Merge pull request #5 from elenasa/master

Integration: empty element, TEST/NOTEST, output subdirs
Merge pull request #6 from elenasa/master

cleanup for yesterday's fixes
Get closer to testing
Merge pull request #3 from DaveAckley/master

tweaks in ulam.tmpl