Lets see if/how this would work.
Initial commit…
Merge remote-tracking branch 'skeleton/skeleton'

Conflicts:
	spec/spec_helper.rb
	tests/init.pp
Unit tests.

Conflicts:
	.fixtures.yml
	Gemfile
	Rakefile
Acceptance tests.

Conflicts:
	Gemfile.lock
	spec/acceptance/nodesets/default.yml
	spec/acceptance/nodesets/full_set.yml
	spec/spec_helper_acceptance.rb
More strict setting for authorized_keys to be file and not anything else.
Fix bug with ssh-key where it should have been named with the email, not the username.
Add .ruby-gemset and .ruby-version files.
Keep version locked for now.
Use SKELETON_MODULE_NAME wherever manual intervention is needed for the module name.
Default yml for beaker acceptance tests links to one_host.yml (lets keep things simple for now).
Add stuff that would be provided with puppet module generate.
Use module_skeleton as the sample module name.
Oops.
Merge remote-tracking branch 'skeleton/skeleton'

Conflicts:
	.fixtures.yml
	README.md
	manifests/init.pp
	spec/spec_helper_acceptance.rb
	tests/init.pp
Fix test breaking due to Host Key Verification failing.