adding parameter to disable openni launch
Merge branch 'groovy-devel' of github.com:ros-interactive-manipulation/pr2_object_manipulation into groovy-devel