They have definitely said that at 'some point' in the game, we'll have to choose which ones we want to stay with us... but they haven't (as far as I'm aware) said when in the game that is.
According to the data mining we should be getting at *least* 2-3 more companions but again, not sure at what point and context in the game they will show up.
