[REVIEW ONLY] update cap-deploy to deal with symlink issue

this needs to be merged while i'm logged in to the puppetmaster to
handle the first deploy (as the symlink needs to be removed). Give me
acks and I'll do it later today or tomorrow.