Remove references to TBB, just use threads

closes #3495

Also fixed some minor formatting in a neighbor macro.