Revert "Merge pull request #1711 from electrical/rename_generate_dir"

This change breaks a number of acceptance tests that are expecting
`puppet module generate author-module` to create the directory
`author-module`. In order to merge the behavior supplied in GH-1711
these tests will need to be fixed.

Example test failure:
https://jenkins.puppetlabs.com/job/Puppet%20Acceptance%20(master)/label=acceptance,platform=rhel/843/#showFailuresLink

This reverts commit 99485b015d61d7bc9a43c4e31de6ae7a7e22d8a3, reversing
changes made to becada3917f08f738a0b4ca5878949964e41df0f.
Merge branch 'master' of https://github.com/puppetlabs/puppet