Cleaned out the groovy to make room for the hyrdo
Initial commit of catkin things
Merged catkin into master