more correct model bounding capsule
merge upstream/master into andrew/inertia

Conflicts:
	interface/src/renderer/Model.cpp
formatting some lines that are too long
reuse boolean results rather than recomputing them
Merge pull request #2862 from AndrewMeadows/inertia

improved model bounding shapes