rakefile mod
Merge branch 'master' of github.com:alberto88a/puppet

Conflicts:
	Rakefile
rakefile omitted