Merge branch 'master' of github.com:hercules-team/augeasproviders into dev/better_errors

Conflicts:
	lib/augeasproviders/provider.rb
	spec/unit/puppet/provider/shellvar/augeas_spec.rb