node swapping is now working.
Merge branch '2014_06_15_TSP' of github.com:jayway/CS-evening into 2014_06_15_TSP