cmake updates (for 2014 on windows)
Merge branch 'master' of https://github.com/RobotLocomotion/drake into lidar_fix_pure