Capture back metadata.json reformating
Merge pull request #178 from cyberious/3.1.x

Capture back metadata.json reformating
Stop managing spec/spec_helper.rb with modulesync
Update spec_helper for more consistency
Merge pull request #193 from mhaskel/spec_updates

Update spec_helper for more consistency
Merge remote-tracking branch 'upstream/3.1.x' into test

Conflicts:
	Gemfile
	manifests/params.pp
	spec/acceptance/restrict_spec.rb
Merge pull request #196 from mhaskel/test

Merge 3.1.x into master
Remove dependency on stdlib4

This removes the backwards incompatible change between 3.0.x and 3.1.x.
Merge pull request #197 from mhaskel/remove_stdlib4

Remove dependency on stdlib4
Merge branch '3.1.x' into test
Merge pull request #192 from cmurphy/master

Synchronize with modulesync
Fix for puppet 3

This was failing on puppet3.
Merge pull request #198 from mhaskel/test

Merge 3.1.x into master
Merge branch 'icehouse' of https://github.com/gwdg/puppetlabs-ntp into icehouse

Conflicts:
	manifests/params.pp
	spec/acceptance/restrict_spec.rb