Combined TPASortByNeighbours(2)

Combined TPASortByNeighbours2 to TPASortByNeighbours.
Removed some of the overloads!