[ENH] Clean up the ConnectivityData mechanism

Now uses indices into an entities vector directly