Merge branch 'master' into 3.1.x
Fix restrict_spec test
Deduplicated the resources that were common amoungst many of them, would love to push them all into a hash and user merge instead
Merge pull request #159 from cyberious/3.1.x

merge Master back up to 3.1.x
Merge pull request #160 from cyberious/dedup_params

Dedup params
3.1.0 prep.
Merge pull request #162 from mhaskel/3.1.0-prep

3.1.0 prep
Remove deprecated Modulefile.

Also removes PE3.2 compatibility as there's a dependency on stdlib 4.
Merge pull request #163 from mhaskel/3.1.1-prep

3.1.1 prep
Pin rspec to ~> 2.10
Merge pull request #164 from cyberious/3.1.x

Pin rspec to ~> 2.11
Fixing typo.
Merge pull request #166 from mhaskel/fix_typo

Fix typo
Prepare a 3.1.2 release.
Merge pull request #176 from apenney/312-release

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

Capture back metadata.json reformating
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