found a unit test that wasn't actually running.  (also had to fix the test, which was failing once it ran)
Merge branch 'master' of https://github.com/RobotLocomotion/drake