Rip out 1.6ness, bump version # to 1.7cvs