Added imagemagic to cms dev dependencies
Moved local_modules to modules_local
Changed to use bundler version of puppet