Dummy merge to advance 'master' branch

'master' only contains git-confine. 'puppet' contains the Puppetization.