Changes to build-canopy-dev, canopy-dev and new mayavi dev config