diff --git a/recipes-ros/actionlib/actionlib_1.10.3.bb b/recipes-ros/actionlib/actionlib_1.10.3.bb
index 04e7c24..1a35e8a 100644
--- a/recipes-ros/actionlib/actionlib_1.10.3.bb
+++ b/recipes-ros/actionlib/actionlib_1.10.3.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "The actionlib stack provides a standardized interface for \
-  interfacing with preemptable tasks."
+DESCRIPTION = "The actionlib stack provides a standardized interface for interfacing with \
+preemptable tasks."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/common-msgs/shape-msgs_1.10.6.bb b/recipes-ros/common-msgs/shape-msgs_1.10.6.bb
index a8747f6..95a34b4 100644
--- a/recipes-ros/common-msgs/shape-msgs_1.10.6.bb
+++ b/recipes-ros/common-msgs/shape-msgs_1.10.6.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "This package contains messages for defining shapes, such as simple solid \
-  object primitives (cube, sphere, etc), planes, and meshes."
+DESCRIPTION = "This package contains messages for defining shapes, such as simple solid object \
+primitives (cube, sphere, etc), planes, and meshes."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/console-bridge/console-bridge_0.2.4.bb b/recipes-ros/console-bridge/console-bridge_0.2.4.bb
index b6080e1..12e5e2e 100644
--- a/recipes-ros/console-bridge/console-bridge_0.2.4.bb
+++ b/recipes-ros/console-bridge/console-bridge_0.2.4.bb
@@ -1,13 +1,11 @@
-DESCRIPTION = "\
-console_bridge is a ROS-independent, pure CMake package that provides logging \
-calls that mirror those found in rosconsole, but for applications that are \
-not necessarily using ROS.\
-"
+DESCRIPTION = "console_bridge is a ROS-independent, pure CMake package that provides logging \
+calls that mirror those found in rosconsole, but for applications that are not necessarily using \
+ROS."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "\
-  file://include/console_bridge/console.h;beginline=1;endline=33;md5=279eed49072cc9f6ebe38974afcc4803 \
-  file://src/console.cpp;beginline=1;endline=33;md5=279eed49072cc9f6ebe38974afcc4803 \
+    file://include/console_bridge/console.h;beginline=1;endline=33;md5=279eed49072cc9f6ebe38974afcc4803 \
+    file://src/console.cpp;beginline=1;endline=33;md5=279eed49072cc9f6ebe38974afcc4803 \
 "
 
 DEPENDS = "boost"
diff --git a/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb b/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb
index 65efe2e..77a12fb 100644
--- a/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb
+++ b/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb
@@ -3,8 +3,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "rosconsole tf roscpp angles message-generation \
-  dynamic-reconfigure libtinyxml realtime-tools message-filters"
+DEPENDS = "rosconsole tf roscpp angles message-generation dynamic-reconfigure libtinyxml \
+    realtime-tools message-filters"
 
 SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "28f8bc6536401456b207e20b4de2e8b3"
diff --git a/recipes-ros/filters/filters_1.7.4.bb b/recipes-ros/filters/filters_1.7.4.bb
index 661b23b..ea6c8b8 100644
--- a/recipes-ros/filters/filters_1.7.4.bb
+++ b/recipes-ros/filters/filters_1.7.4.bb
@@ -10,6 +10,6 @@ SRC_URI[md5sum] = "0dd26504be16afa7816e9a5aa11715f1"
 SRC_URI[sha256sum] = "fb71f1fbeaf89726877fce66dce1db8957c5cc6dffa1973d6a104a10233f8237"
 
 SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch; \
-  file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch"
+    file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch"
 
 inherit catkin
diff --git a/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb b/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb
index 0226067..717a315 100644
--- a/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb
+++ b/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "A libfreenect based ROS driver for the Microsoft Kinect.\
-This is a port of the OpenNI driver to use libfreenect."
+DESCRIPTION = "A libfreenect based ROS driver for the Microsoft Kinect. This is a port of the \
+OpenNI driver to use libfreenect."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "camera-info-manager diagnostic-updater dynamic-reconfigure \
-  image-transport libfreenect nodelet roscpp sensor-msgs pluginlib"
+    image-transport libfreenect nodelet roscpp sensor-msgs pluginlib"
 
 require freenect-stack.inc
diff --git a/recipes-ros/geometry-experimental/tf2_0.4.11.bb b/recipes-ros/geometry-experimental/tf2_0.4.11.bb
index e85a338..b025036 100644
--- a/recipes-ros/geometry-experimental/tf2_0.4.11.bb
+++ b/recipes-ros/geometry-experimental/tf2_0.4.11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "tf2 is the second generation of the transform library, which lets \
-  the user keep track of multiple coordinate frames over time."
+the user keep track of multiple coordinate frames over time."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/gscam/gscam_0.1.3.bb b/recipes-ros/gscam/gscam_0.1.3.bb
index 4b2b83b..e0e3a5a 100644
--- a/recipes-ros/gscam/gscam_0.1.3.bb
+++ b/recipes-ros/gscam/gscam_0.1.3.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "gstreamer gst-plugins-base nodelet opencv roscpp image-transport sensor-msgs \
-  camera-calibration-parsers camera-info-manager"
+    camera-calibration-parsers camera-info-manager"
 
 SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "c20617a0db24124168fe968365ecb990"
diff --git a/recipes-ros/image-common/polled-camera_1.11.3.bb b/recipes-ros/image-common/polled-camera_1.11.3.bb
index 614a731..f465aa4 100644
--- a/recipes-ros/image-common/polled-camera_1.11.3.bb
+++ b/recipes-ros/image-common/polled-camera_1.11.3.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "polled_camera contains a service and C++ helper classes for implementing a polled \
-  camera driver node and requesting images from it."
+camera driver node and requesting images from it."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/image-pipeline/camera-calibration_1.11.10.bb b/recipes-ros/image-pipeline/camera-calibration_1.11.10.bb
index 2596fb0..946d2eb 100644
--- a/recipes-ros/image-pipeline/camera-calibration_1.11.10.bb
+++ b/recipes-ros/image-pipeline/camera-calibration_1.11.10.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "camera_calibration allows easy calibration of monocular or stereo \
-  cameras using a checkerboard calibration target."
+DESCRIPTION = "camera_calibration allows easy calibration of monocular or stereo cameras using a \
+checkerboard calibration target."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=24;endline=24;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/image-pipeline/image-rotate_1.11.10.bb b/recipes-ros/image-pipeline/image-rotate_1.11.10.bb
index 02fef0c..2d253bf 100644
--- a/recipes-ros/image-pipeline/image-rotate_1.11.10.bb
+++ b/recipes-ros/image-pipeline/image-rotate_1.11.10.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "Contains a node that rotates an image stream in a way that minimizes \
-  the angle between a vector in some arbitrary frame and a vector in the camera frame."
+DESCRIPTION = "Contains a node that rotates an image stream in a way that minimizes the angle \
+between a vector in some arbitrary frame and a vector in the camera frame."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=26;endline=26;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/image-transport-plugins/compressed-depth-image-transport_1.8.21.bb b/recipes-ros/image-transport-plugins/compressed-depth-image-transport_1.8.21.bb
index dfa9ddb..f28981e 100644
--- a/recipes-ros/image-transport-plugins/compressed-depth-image-transport_1.8.21.bb
+++ b/recipes-ros/image-transport-plugins/compressed-depth-image-transport_1.8.21.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "Compressed_depth_image_transport provides a plugin to image_transport \
-  for transparently sending depth images (raw, floating-point) using PNG compression."
+DESCRIPTION = "Compressed_depth_image_transport provides a plugin to image_transport for \
+transparently sending depth images (raw, floating-point) using PNG compression."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/image-transport-plugins/compressed-image-transport_1.8.21.bb b/recipes-ros/image-transport-plugins/compressed-image-transport_1.8.21.bb
index 59e3a87..64840be 100644
--- a/recipes-ros/image-transport-plugins/compressed-image-transport_1.8.21.bb
+++ b/recipes-ros/image-transport-plugins/compressed-image-transport_1.8.21.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "Compressed_image_transport provides a plugin to image_transport for \
-  transparently sending images encoded as JPEG or PNG."
+DESCRIPTION = "Compressed_image_transport provides a plugin to image_transport for transparently \
+sending images encoded as JPEG or PNG."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/image-transport-plugins/theora-image-transport_1.8.21.bb b/recipes-ros/image-transport-plugins/theora-image-transport_1.8.21.bb
index faa46a2..a92b778 100644
--- a/recipes-ros/image-transport-plugins/theora-image-transport_1.8.21.bb
+++ b/recipes-ros/image-transport-plugins/theora-image-transport_1.8.21.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Theora_image_transport provides a plugin to image_transport for \
-  transparently sending an image stream encoded with the Theora codec."
+transparently sending an image stream encoded with the Theora codec."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/laser-filters/laser-filters_1.6.14.bb b/recipes-ros/laser-filters/laser-filters_1.6.14.bb
index 86d5505..de1f050 100644
--- a/recipes-ros/laser-filters/laser-filters_1.6.14.bb
+++ b/recipes-ros/laser-filters/laser-filters_1.6.14.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "Assorted filters designed to operate on 2D planar laser scanners, \
-  which use the sensor_msgs/LaserScan type."
+DESCRIPTION = "Assorted filters designed to operate on 2D planar laser scanners, which use the \
+sensor_msgs/LaserScan type."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/laser-geometry/laser-geometry_1.5.16.bb b/recipes-ros/laser-geometry/laser-geometry_1.5.16.bb
index c4cd7b3..1d4511f 100644
--- a/recipes-ros/laser-geometry/laser-geometry_1.5.16.bb
+++ b/recipes-ros/laser-geometry/laser-geometry_1.5.16.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "This package contains a class for converting from a 2D laser scan as defined by \
-  sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud \
-  or sensor_msgs/PointCloud2."
+sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud \
+or sensor_msgs/PointCloud2."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/navigation/base-local-planner_1.11.11.bb b/recipes-ros/navigation/base-local-planner_1.11.11.bb
index 09d28ef..0f8b4e8 100644
--- a/recipes-ros/navigation/base-local-planner_1.11.11.bb
+++ b/recipes-ros/navigation/base-local-planner_1.11.11.bb
@@ -1,10 +1,11 @@
-DESCRIPTION = "This package provides implementations of the Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane."
+DESCRIPTION = "This package provides implementations of the Trajectory Rollout and Dynamic Window \
+approaches to local robot navigation on a plane."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=01c2bc31767ccb3a68e12f02612b2a97"
 
 DEPENDS = "angles costmap-2d dynamic-reconfigure geometry-msgs libeigen message-generation \
-  nav-core nav-msgs pcl-conversions pcl-ros pluginlib rosconsole roscpp rospy std-msgs tf \
-  voxel-grid visualization-msgs"
+    nav-core nav-msgs pcl-conversions pcl-ros pluginlib rosconsole roscpp rospy std-msgs tf \
+    voxel-grid visualization-msgs"
 
 require navigation.inc
diff --git a/recipes-ros/navigation/clear-costmap-recovery_1.11.11.bb b/recipes-ros/navigation/clear-costmap-recovery_1.11.11.bb
index 3bd7a28..81b806c 100644
--- a/recipes-ros/navigation/clear-costmap-recovery_1.11.11.bb
+++ b/recipes-ros/navigation/clear-costmap-recovery_1.11.11.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "This package provides a recovery behavior for the navigation stack that \
-   attempts to clear space by reverting the costmaps used by the navigation stack to \
-  the static map outside of a given area."
+DESCRIPTION = "This package provides a recovery behavior for the navigation stack that attempts to \
+clear space by reverting the costmaps used by the navigation stack to the static map outside of a \
+given area."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=01c2bc31767ccb3a68e12f02612b2a97"
diff --git a/recipes-ros/navigation/costmap-2d_1.11.11.bb b/recipes-ros/navigation/costmap-2d_1.11.11.bb
index 647fc76..21f535e 100644
--- a/recipes-ros/navigation/costmap-2d_1.11.11.bb
+++ b/recipes-ros/navigation/costmap-2d_1.11.11.bb
@@ -1,13 +1,13 @@
-DESCRIPTION = "This package provides an implementation of a 2D costmap that takes in sensor \
-  data from the world, builds a 2D or 3D occupancy grid of the data (depending \
-  on whether a voxel based implementation is used), and inflates costs in a \
-  2D costmap based on the occupancy grid and a user specified inflation radius."
+DESCRIPTION = "This package provides an implementation of a 2D costmap that takes in sensor data \
+from the world, builds a 2D or 3D occupancy grid of the data (depending on whether a voxel based \
+implementation is used), and inflates costs in a 2D costmap based on the occupancy grid and a user \
+specified inflation radius."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=19;endline=19;md5=01c2bc31767ccb3a68e12f02612b2a97"
 
-DEPENDS = "libeigen cmake-modules dynamic-reconfigure geometry-msgs laser-geometry map-msgs message-filters \
-  message-generation nav-msgs pcl-conversions pcl-ros pluginlib roscpp \
-  sensor-msgs std-msgs tf visualization-msgs voxel-grid"
+DEPENDS = "libeigen cmake-modules dynamic-reconfigure geometry-msgs laser-geometry map-msgs \
+    message-filters message-generation nav-msgs pcl-conversions pcl-ros pluginlib roscpp \
+    sensor-msgs std-msgs tf visualization-msgs voxel-grid"
 
 require navigation.inc
diff --git a/recipes-ros/navigation/dwa-local-planner_1.11.11.bb b/recipes-ros/navigation/dwa-local-planner_1.11.11.bb
index e44b510..b094242 100644
--- a/recipes-ros/navigation/dwa-local-planner_1.11.11.bb
+++ b/recipes-ros/navigation/dwa-local-planner_1.11.11.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "This package provides an implementation of the Dynamic Window Approach to \
-  local robot navigation on a plane."
+DESCRIPTION = "This package provides an implementation of the Dynamic Window Approach to local \
+robot navigation on a plane."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=20;endline=20;md5=01c2bc31767ccb3a68e12f02612b2a97"
 
 DEPENDS = "base-local-planner costmap-2d dynamic-reconfigure libeigen nav-core \
-  nav-msgs pluginlib pcl-conversions roscpp tf"
+    nav-msgs pluginlib pcl-conversions roscpp tf"
 
 require navigation.inc
diff --git a/recipes-ros/navigation/move-base_1.11.11.bb b/recipes-ros/navigation/move-base_1.11.11.bb
index 04f004c..20b6605 100644
--- a/recipes-ros/navigation/move-base_1.11.11.bb
+++ b/recipes-ros/navigation/move-base_1.11.11.bb
@@ -1,9 +1,10 @@
-DESCRIPTION = "The move_base package provides an implementation of an action that, given a goal in the world, will attempt to reach it with a mobile base."
+DESCRIPTION = "The move_base package provides an implementation of an action that, given a goal in \
+the world, will attempt to reach it with a mobile base."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=01c2bc31767ccb3a68e12f02612b2a97"
 
 DEPENDS = "actionlib costmap-2d dynamic-reconfigure geometry-msgs message-generation move-base-msgs \
-  nav-core nav-msgs pluginlib roscpp rospy std-msgs std-srvs tf visualization-msgs"
+    nav-core nav-msgs pluginlib roscpp rospy std-msgs std-srvs tf visualization-msgs"
 
 require navigation.inc
diff --git a/recipes-ros/navigation/navfn_1.11.11.bb b/recipes-ros/navigation/navfn_1.11.11.bb
index 256c791..f187602 100644
--- a/recipes-ros/navigation/navfn_1.11.11.bb
+++ b/recipes-ros/navigation/navfn_1.11.11.bb
@@ -1,9 +1,10 @@
-DESCRIPTION = "navfn provides a fast interpolated navigation function that can be used to create plans for a mobile base."
+DESCRIPTION = "navfn provides a fast interpolated navigation function that can be used to create \
+plans for a mobile base."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=19;endline=19;md5=01c2bc31767ccb3a68e12f02612b2a97"
 
 DEPENDS = "costmap-2d geometry-msgs nav-core nav-msgs pcl-conversions pcl-ros \
-  pluginlib rosconsole roscpp tf visualization-msgs"
+    pluginlib rosconsole roscpp tf visualization-msgs"
 
 require navigation.inc
diff --git a/recipes-ros/navigation/rotate-recovery_1.11.11.bb b/recipes-ros/navigation/rotate-recovery_1.11.11.bb
index 1805b6e..784c43b 100644
--- a/recipes-ros/navigation/rotate-recovery_1.11.11.bb
+++ b/recipes-ros/navigation/rotate-recovery_1.11.11.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "This package provides a recovery behavior for the navigation stack that attempts \
-  to clear space by performing a 360 degree rotation of the robot."
+DESCRIPTION = "This package provides a recovery behavior for the navigation stack that attempts to \
+clear space by performing a 360 degree rotation of the robot."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=01c2bc31767ccb3a68e12f02612b2a97"
diff --git a/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb b/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb
index a977613..3afb143 100644
--- a/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb
+++ b/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/${ROS_SP}"
 inherit catkin
 
 do_configure_append() {
-  sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
-    -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \
-    ${B}/CMakeFiles/octomap_ros.dir/build.make
+    sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
+        -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \
+        ${B}/CMakeFiles/octomap_ros.dir/build.make
 }
diff --git a/recipes-ros/octomap/octomap.inc b/recipes-ros/octomap/octomap.inc
index 8f86473..f6240ea 100644
--- a/recipes-ros/octomap/octomap.inc
+++ b/recipes-ros/octomap/octomap.inc
@@ -5,7 +5,7 @@ SRC_URI[sha256sum] = "cad32744152970d0ab141d12c122d0482510644f29c61b8464bbfc65eb
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
 EXTRA_OECMAKE += "\
-  -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_SKIP_RPATH=ON \
 "
 
 inherit cmake ros
diff --git a/recipes-ros/pluginlib/pluginlib_1.9.24.bb b/recipes-ros/pluginlib/pluginlib_1.9.24.bb
index c61e932..92d6cfb 100644
--- a/recipes-ros/pluginlib/pluginlib_1.9.24.bb
+++ b/recipes-ros/pluginlib/pluginlib_1.9.24.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "The pluginlib package provides tools for writing and dynamically \
-  loading plugins using the ROS build infrastructure."
+DESCRIPTION = "The pluginlib package provides tools for writing and dynamically loading plugins \
+using the ROS build infrastructure."
 SECTION = "devel"
 LICENSE = "BSD & BSL-1.0"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=10;md5=bbbb6ab628b1f3daee74dd9c62bee312"
diff --git a/recipes-ros/robot-model/collada-urdf_1.10.18.bb b/recipes-ros/robot-model/collada-urdf_1.10.18.bb
index 1b107f1..dc2f094 100644
--- a/recipes-ros/robot-model/collada-urdf_1.10.18.bb
+++ b/recipes-ros/robot-model/collada-urdf_1.10.18.bb
@@ -1,4 +1,5 @@
-DESCRIPTION = "This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents."
+DESCRIPTION = "This package contains a tool to convert Unified Robot Description Format (URDF) \
+documents into COLLAborative Design Activity (COLLADA) documents."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
@@ -8,10 +9,10 @@ DEPENDS = "angles assimp resource-retriever collada-dom collada-parser roscpp ur
 require robot-model.inc
 
 do_configure_append() {
-  for f in collada_urdf.dir collada_to_urdf.dir urdf_to_collada.dir
-  do
-  sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
-    -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \
-    ${B}/CMakeFiles/$f/build.make
-  done
+    for f in collada_urdf.dir collada_to_urdf.dir urdf_to_collada.dir
+    do
+    sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
+        -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \
+        ${B}/CMakeFiles/$f/build.make
+    done
 }
diff --git a/recipes-ros/ros-comm/rosbag-storage_1.10.10.bb b/recipes-ros/ros-comm/rosbag-storage_1.10.10.bb
index dbb7143..9879cb3 100644
--- a/recipes-ros/ros-comm/rosbag-storage_1.10.10.bb
+++ b/recipes-ros/ros-comm/rosbag-storage_1.10.10.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "This is a set of tools for recording from and playing back ROS \
-  message without relying on the ROS client library."
+DESCRIPTION = "This is a set of tools for recording from and playing back ROS message without \
+relying on the ROS client library."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/ros-comm/rosbag_1.10.10.bb b/recipes-ros/ros-comm/rosbag_1.10.10.bb
index d2e06e9..02ecc87 100644
--- a/recipes-ros/ros-comm/rosbag_1.10.10.bb
+++ b/recipes-ros/ros-comm/rosbag_1.10.10.bb
@@ -1,16 +1,15 @@
-DESCRIPTION = "This is a set of tools for recording from and playing back to ROS \
-topics.  It is intended to be high performance and avoids \
-deserialization and reserialization of the messages."
+DESCRIPTION = "This is a set of tools for recording from and playing back to ROS topics.  It is \
+intended to be high performance and avoids deserialization and reserialization of the messages."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "boost cpp-common python-imaging rosbag-storage \
-  rosconsole roscpp roscpp-serialization topic-tools xmlrpcpp"
+DEPENDS = "boost cpp-common python-imaging rosbag-storage rosconsole roscpp roscpp-serialization
+    topic-tools xmlrpcpp"
 
 require ros-comm.inc
 
 ROS_PKG_SUBDIR = "tools"
 
 RDEPENDS_${PN} = "python-compression python-threading python-pyyaml python-io \
-  genmsg genpy roslib rospy"
+    genmsg genpy roslib rospy"
diff --git a/recipes-ros/ros-comm/roscpp_1.10.10.bb b/recipes-ros/ros-comm/roscpp_1.10.10.bb
index 7126b22..8edfdc0 100644
--- a/recipes-ros/ros-comm/roscpp_1.10.10.bb
+++ b/recipes-ros/ros-comm/roscpp_1.10.10.bb
@@ -1,13 +1,12 @@
-DESCRIPTION = "roscpp is a C++ implementation of ROS. It provides a client \
-  library that enables C++ programmers to quickly interface with ROS Topics, \
-  Services, Parameters. roscpp is the most widely used ROS client library and is designed to \
-  be the high-performance library for ROS."
+DESCRIPTION = "roscpp is a C++ implementation of ROS. It provides a client library that enables \
+C++ programmers to quickly interface with ROS Topics, Services, Parameters. roscpp is the most \
+widely used ROS client library and is designed to be the high-performance library for ROS."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "cpp-common message-generation rosconsole roscpp-serialization \
-           roscpp-traits rosgraph-msgs roslang rostime std-msgs xmlrpcpp"
+DEPENDS = "cpp-common message-generation rosconsole roscpp-serialization roscpp-traits \
+    rosgraph-msgs roslang rostime std-msgs xmlrpcpp"
 
 require ros-comm.inc
 
diff --git a/recipes-ros/ros-comm/roslaunch_1.10.10.bb b/recipes-ros/ros-comm/roslaunch_1.10.10.bb
index 38e6de2..8865cce 100644
--- a/recipes-ros/ros-comm/roslaunch_1.10.10.bb
+++ b/recipes-ros/ros-comm/roslaunch_1.10.10.bb
@@ -9,37 +9,37 @@ PR = "r1"
 require ros-comm.inc
 
 SRC_URI += "file://0001-increase-rosmaster-timeout.patch \
-  file://roscore.service \
-  file://roscore-default \
+    file://roscore.service \
+    file://roscore-default \
 "
 
 ROS_PKG_SUBDIR = "tools"
 
 RDEPENDS_${PN} = "\
-  coreutils \
-  python-textutils \
-  python-logging \
-  python-threading \
-  python-rospkg \
-  rosgraph \
-  python-pyyaml \
-  roslib \
-  rosclean \
-  rosmaster \
-  rosgraph-msgs \
+    coreutils \
+    python-textutils \
+    python-logging \
+    python-threading \
+    python-rospkg \
+    rosgraph \
+    python-pyyaml \
+    roslib \
+    rosclean \
+    rosmaster \
+    rosgraph-msgs \
     genpy \
     std-msgs \
-  rosout \
-  rosparam \
+    rosout \
+    rosparam \
 "
 
 do_install_append() {
-  install -d ${D}/${sysconfdir}/default
-  install -m 0644 ${WORKDIR}/roscore-default ${D}/${sysconfdir}/default/roscore
+    install -d ${D}/${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/roscore-default ${D}/${sysconfdir}/default/roscore
 
-  # Install systemd unit file
-  install -d ${D}${systemd_unitdir}/system/
-  install -m 0644 ${WORKDIR}/roscore.service ${D}${systemd_unitdir}/system/roscore.service
+    # Install systemd unit file
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/roscore.service ${D}${systemd_unitdir}/system/roscore.service
 }
 
 FILES_${PN}-systemd += "${sysconfdir}/default/roscore \
diff --git a/recipes-ros/ros-comm/rosparam_1.10.10.bb b/recipes-ros/ros-comm/rosparam_1.10.10.bb
index d014d12..ea55546 100644
--- a/recipes-ros/ros-comm/rosparam_1.10.10.bb
+++ b/recipes-ros/ros-comm/rosparam_1.10.10.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "the rosparam command-line tool for getting and setting ROS Parameters on the \
-  Parameter Server using YAML-encoded files."
+Parameter Server using YAML-encoded files."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/ros-comm/rospy_1.10.10.bb b/recipes-ros/ros-comm/rospy_1.10.10.bb
index 802be6f..862c908 100644
--- a/recipes-ros/ros-comm/rospy_1.10.10.bb
+++ b/recipes-ros/ros-comm/rospy_1.10.10.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "rospy is a pure Python client library for ROS. The rospy client \
-  API enables Python programmers to quickly interface with ROS Topics, Services, and Parameters."
+DESCRIPTION = "rospy is a pure Python client library for ROS. The rospy client API enables Python \
+programmers to quickly interface with ROS Topics, Services, and Parameters."
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=23;endline=23;md5=d566ef916e9dedc494f5f793a6690ba5"
diff --git a/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb b/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb
index c1300b5..bbe4ecf 100644
--- a/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb
+++ b/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "XmlRpc++ is a C++ implementation of the XML-RPC protocol. This version is heavily \
-  modified from the package available on SourceForge in order to support roscpp's threading model. \
-  As such, we are maintaining our own fork."
+modified from the package available on SourceForge in order to support roscpp's threading model. \
+As such, we are maintaining our own fork."
 SECTION = "devel"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=184dd1523b9a109aead3fbbe0b4262e0"
diff --git a/recipes-ros/ros-controllers/gripper-action-controller_0.7.2.bb b/recipes-ros/ros-controllers/gripper-action-controller_0.7.2.bb
index 106c80d..f9bbc39 100644
--- a/recipes-ros/ros-controllers/gripper-action-controller_0.7.2.bb
+++ b/recipes-ros/ros-controllers/gripper-action-controller_0.7.2.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "actionlib angles cmake-modules roscpp urdf control-toolbox controller-interface \
-  hardware-interface realtime-tools control-msgs trajectory-msgs controller-manager xacro"
+    hardware-interface realtime-tools control-msgs trajectory-msgs controller-manager xacro"
 
 require ros-controllers.inc
 
diff --git a/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.2.bb b/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.2.bb
index 7e94e43..dce69ef 100644
--- a/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.2.bb
+++ b/recipes-ros/ros-controllers/joint-trajectory-controller_0.7.2.bb
@@ -8,4 +8,4 @@ DEPENDS = "actionlib angles cmake-modules control-toolbox controller-interface c
 require ros-controllers.inc
 
 SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2 \
-  file://0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch;striplevel=2"
+    file://0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch;striplevel=2"
diff --git a/recipes-ros/velodyne/velodyne-pointcloud_1.1.2.bb b/recipes-ros/velodyne/velodyne-pointcloud_1.1.2.bb
index 59740cd..1e52cf6 100644
--- a/recipes-ros/velodyne/velodyne-pointcloud_1.1.2.bb
+++ b/recipes-ros/velodyne/velodyne-pointcloud_1.1.2.bb
@@ -4,6 +4,6 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "angles nodelet pcl-conversions pcl-ros pluginlib roscpp roslib sensor-msgs tf \
-  velodyne-driver velodyne-msgs yaml-cpp"
+    velodyne-driver velodyne-msgs yaml-cpp"
 
 require velodyne.inc