Merge remote-tracking branch 'lancepeelmon/addAmazonLinux'

Conflicts:
	manifests/init.pp
	manifests/params.pp