add typical programs
Merge puppetfile changes