reduce dependence on drake_config.mat.  it was causing problems for parallel tests
Merge branch 'master' of https://github.com/RobotLocomotion/drake