Bump puppet-puppet; update cap-deploy to deal with symlink issue