Non-billlable time in contracts and invoices

Tobias mentioned that it appears non-billable time is being included in contract hours and invoice pages.  This needs to be confirmed.  Also:

"It would be nice to *see* the non-billable time on the invoices page (and perhaps the contract) but not have it be included in the totals.  I'm not sure if it makes sense to mark that non-billable time as "invoiced" at the entry level - I am open to suggestions."