Updated neocons to 3.0.0-rc1 and fixed fallout