Bump version to 1.1.4
Issue #242 Get organization from name correctly if name has multiple dashes
Issue #220 Add support for metadata.json
Merge branch 'master' into 1.0.x

Conflicts:
	lib/librarian/puppet/version.rb