Cleaned up code so should now be compiling. Greedy and 2opt search is complete.