changed launch files for new VO
Merge branch 'cityflyer' of https://github.com/ccny-ros-pkg/mav_tools into cityflyer