Added support for catkin
Rearrange call to setup
Add package to setup.py