Fixed build for Indigo
Standardising python parts based on catkin docs.