Fix options 'owner' and 'group' and add 'strip_level'.
Merge branch 'master' of https://github.com/andreyev/puppet-deploy

Conflicts:
	manifests/file.pp