Technically, you can have all your companions on your team at once right now. Not sure if they'll leave it in though.