Implemented neighbour list for NN and 2.5-opt
merge