changes from RYDS testing on 10/13 with Henry
Merge branch 'master' of https://github.com/gt-ros-pkg/hrl-assistive