Fixing issue where no-bill bills cause issues in teh template.
Reformatting some code and some of the companion bill checking.
Updating NY examples.
Merging in changes.