minor cleanup
Merge branch 'handsim' of https://github.com/RussTedrake/drake into handsim

Conflicts:
	systems/plants/TimeSteppingRigidBodyManipulator.m