add full support for the new puppet format
Merge branch 'master' of github.com:vanpattenmedia/vpmframe-gem

Conflicts:
	vpmframe.gemspec