Rebase, resolved conflicts
Interim check in while I look at another issue.
Interim checkin. Collision handling still not satisfactory.

Setting a point from which I will experiment.
Improved (?) collision handling. Still not great.

This may require revisiting again. Don't close out 25 yet.
Merge branch 'issue25' into develop
Split issue25. Moved issue25 back to "may need to revisit.

Truncation of path when attacking is moved to issue44.