Jump to version 2.0.0 to leave 1.x for Ruby 1.8
Merge branch 'master' into 1.x

Conflicts:
	lib/librarian/puppet/version.rb
	librarian-puppet.gemspec