[Kqlives-main] some more changes on CVS

[Peter H. <pe...@va...>]

I made some changes which ended up being quite far-reaching... Please 
could everyone test the latest CVS code. Hopefully all you will see is 
the bit where you meet Ajathar at the other end of the tunnel*, but I 
may have broken the build system, too. 

Let me know,

pete

* including team selector at last!