Merge fixes
Merge branch 'indigo-devel' of https://github.com/davetcoleman/moveit_visual_tools into indigo-devel