Making some changes to update to 24.4
Fixing some ERC weirdness
Recompiling bbdb