(FACT-472) Sync facter-2 branch to master

This syncs facter-2 branch to master, i.e. leaves
master identical to facter-2. For background on this see:

https://groups.google.com/forum/#!msg/puppet-dev/Q24GLe6s1_4/hPwHgvVhnpIJ

Logistically, this was accomplished with the following:
  git diff master..facter-2 | git apply -
  git add --ignore-removal .
  git ls-files --deleted | xargs git rm
Revert "(maint) Update docs to reflect use of facter-2 branch"

This reverts commit 2600f04211d6316f78416ff1bfedcbb70a6f0bfd.
Merge pull request #717 from kylog/issue/fact-472/sync-facter-2-to-master

Issue/fact 472/sync facter 2 to master