Merge pull request #115 from jlsherrill/7386

fixes #7386 - fixing install with capsule-tftp=true
fixes #7396 - fully configure puppet in dev environment