Version bump
Merge branch 'master' of https://github.com/example42/puppet-puppet
Release v2.0.20
Merge branch 'master' of https://github.com/example42/puppet-puppet
tests: fix setup to install current gem versions

  * Use default filename for Gemfile to reduce setup hassle
  * Add Gemfile.lock to .gitignore
  * fix travis.yml
tests: fix autorestart test logic
tests: add concat_basedir fact to fix firewall tests
tests: travis: remove puppet 2.6 support
travis: run specs under bundler to see all installed gems
travis: for some reason puppet 3.0.0 has problems, instead add the newer versions
remove stored reports after a week
Add reports_retention_age param
Remove deprecated templatedir setting.
Merge pull request #100 from DavidS/fix-tests

Fix tests
Merge pull request #101 from DavidS/remove-deprecated-templatedir

Remove deprecated templatedir setting.
Merge branch 'master' of https://github.com/example42/puppet-puppet
Merge branch 'clean-stored-reports' of https://github.com/DavidS/puppet-puppet into DavidS-clean-stored-reports

Conflicts:
	manifests/init.pp
Merge branch 'master' of https://github.com/example42/puppet-puppet