More testing and fixes for corner case problem with 2-opt code.
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop
some work before I merge
Merge branch 'develop' into vdev
commiting unfinished work, before working with twpath