Making etc path general via cmake-configured barrett/config.h header and static const string concatenation function.
Merge remote-tracking branch 'origin/general-etc-path' into catkin-1.2.1
Moving include_directories call to the right place