(maint) Fix formatting of the show_diff description
(pup-2048) Add a show_diff parameter for the augeas type
(pup-2048) Implement augeas show_diff parameter
(maint) Fix typo in test name
(maint) Add a commented out Gemfile section specifying the correct augeas gem
Merge pull request #2486 from kylog/issue/pup-2048/add-show_diffs-to-augeas

(PUP 2048) add show diffs to augeas
Merge branch 'master' of https://github.com/puppetlabs/puppet