added patient address to cat1 export
Small style changes in the template

Changing > 0 to present?
ERb changes to eliminate blank lines from being generated
Merge branch 'cat1-patient-address'

Rebasing and merging pull request #127
Minor style changes as well.