Number headers update

Updated ant number-headers task to leave off suffix when creating new header ids.