Fix a typo in Neighborhoods::getInterSwNeighborhood
Changed the tabu search to use separate iterators for each neighborhood.
Cleaned up the code around terminating criteria.
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop
Added Solution::computeCosts() call in Neighborhoods::applyMove to keep tings updated.
Merge branch 'sdev' into develop
integrated vicky's code into tabu search. Cleaned up some formating in vehicle.
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop

Conflicts:
	baseTrash/vehicle.cpp
id shown in low level graphs
added a timedistance condition, and fixed intraswp