Revert "Merge pull request #2 from fspindle/catkin" due to a wrong branc...

...h merge.

This reverts commit b721c01c0955639394712f86dcbf667d57e077e0, reversing
changes made to 064ff7fac2206c8013716e901ec045ab11b084fb.