Fix README.txt post-rename.
init.pp - Make puppet-lint clean.
Don't apply bug workaround to versions which no longer need it.
Make /etc/hiera.yaml symlink to /etc/puppet/hiera.yaml for maintainability.
Merge pull request #7 from anl/upstream

Minor fixes.
README.txt - Add alternate usage string.
Merge pull request #8 from anl/upstream

README.txt - Add alternate usage string.
Disable default Apache site.
Finish disabling Apache listener on port 80.
Merge pull request #9 from anl/upstream

Disable Apache listener on port 80.
Switch default from hiera-gpg "master" to v1.1.0.
Ignore .rbenv-version files.
bug fix for an error message

the error:
err: Removing mount files: /etc/puppet/files does not exist or is not a directory

simply caused by the directory not being present.
Merge pull request #10 from anl/upstream

Switch hiera-gpg from master to 1.1.0
Merge pull request #11 from preflightsiren/bug-fixes

bug fix for an error message
Silence puppet-lint as much as possible.
Add notes about Puppetmaster package versions.
Merge branch 'upstream'

Conflicts:
	README.txt
	manifests/init.pp