Merging hydro devel

Merged in the latest changes to ros-planning/hydro-devel.  I know you're supposed to fix tabbing issues separately, but while merging conflicts I couldn't help fixing just a few of the most egregious ones.  
Tested on stock-turtlebot navigation, haven't tested with our custom turtlebot nav launch files yet (hard to get those downloaded remotely).