minor tweaks from lecture 11
Merge branch 'master' of https://github.com/RobotLocomotion/drake