tweaks
fix barrett
Merge branch 'bsp_collision' of github.com:dementrock/trajopt into bsp_collision