more scottfree fixes
Merge branch 'bill' of git@github.com:zot/Leisure.git into roy
adding outputNoNl override