Merge branch '1.6.x'

* 1.6.x:
  (#14764) Stop calling enum_cpuinfo and enum_lsdev on unsuitable platforms
  (#16829) Change how bundler is detected
  Only load rubygems in bin/facter
  Update lib/facter/version.rb for 1.6.13
  Updating FACTERVERSION for facter 1.6.13-rc1
  Remove CHANGELOG from Facter
  Remove INSTALL from Facter
  Spec file cleanup
  Remove asc file a source for RPM builds
  Update default cows
  (maint) Update debian/rules to use new --ruby flag

Conflicts:
	CHANGELOG
	lib/facter/version.rb
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#14764) Stop calling enum_cpuinfo and enum_lsdev on unsuitable platforms
  (#16829) Change how bundler is detected
  Only load rubygems in bin/facter
  Update lib/facter/version.rb for 1.6.13
  Updating FACTERVERSION for facter 1.6.13-rc1
  Remove CHANGELOG from Facter
  Remove INSTALL from Facter
  Spec file cleanup
  Remove asc file a source for RPM builds
  Update default cows
  (maint) Update debian/rules to use new --ruby flag

Conflicts:
	CHANGELOG
	lib/facter/version.rb
Merge branch '2.x'

* 2.x:
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#13535) Fix uptime; use `uptime` instead of `who -b`
Merge branch '2.x'

* 2.x:
  (#13535) Fix uptime; use `uptime` instead of `who -b`
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#16506) Fix illegal option error from uname on hpux
Merge branch '2.x'

* 2.x:
  (#16506) Fix illegal option error from uname on hpux
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#16526) Fix physicalprocessorcount fact on Solaris
Merge branch '2.x'

* 2.x:
  (#16526) Fix physicalprocessorcount fact on Solaris
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#16527) Fix processorcount fact on Solaris
Merge branch '2.x'

* 2.x:
  (#16527) Fix processorcount fact on Solaris
(maint) Add newlines to all files (whitespace only)

Without this patch there are a number of files that do not have
newlines.  This is a problem because it makes it difficult to use
`perl -pl -i -e ...`
(maint) Remove rspec from shebang lines

Without this patch Ruby 1.9 is still complaining loudly about trying to parse
the spec files.

I'd prefer to remove the shebang lines entirely, but doing so will cause
encoding errors in Ruby 1.9.  This patch strives for a happy middle ground of
convincing Ruby it is actually working with Ruby while not confusing it to
think it should exec() to rspec.

This patch is the result of the following command run against the source tree:

    find spec -type f -print0 | \
      xargs -0 perl -pl -i -e 's,^\#\!\s?/(.*)rspec,\#! /usr/bin/env ruby,'
Merge branch 'maint/2.x/cleanup' into 2.x

* maint/2.x/cleanup:
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
Merge branch '2.x'

* 2.x:
  (maint) Remove rspec from shebang lines
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
  (maint) Add newlines to all files (whitespace only)
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (maint) Add mailmap for git shortlog
Merge branch '2.x'

* 2.x:
  (maint) Add mailmap for git shortlog
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#8210) Add a heavy virtual fact using virt-what
  (maint) Properly indent virtual_spec.rb
  (maint) Cleanup of the virtual spec tests.
Merge branch '2.x'

* 2.x:
  (#8210) Add a heavy virtual fact using virt-what
  (maint) Properly indent virtual_spec.rb
  (maint) Cleanup of the virtual spec tests.