fixed some motion planning
Merge branch 'master' of https://github.com/evankr/armlab