Ongoing updates to adhere to the ruby style guide
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/puppet/provider/package/portagegt.rb