some ryan changes
Merge branch 'master' into ryan

Conflicts:
	slinky.tex
small tweaks, new opening paragraph for section 4. Still more to do there.