minor changes with collisions
Merge branch 'master' of github.com:WPI-RAIL/carl_moveit