Merge pull request #45 from jkammerl/layered-costmaps-catkinized

minor catkin/bloom fixes