updating drake
Merge branch 'rigidbody' of https://github.com/RobotLocomotion/drake-distro into rigidbody