Bump version to 1.2.1
If no Puppetfile is present default to use the metadata.json or Modulefile
Issue #235 Error when forge is not defined in Puppetfile
Bump version to 1.3.0 and update changelog
Issue #243 Warn if Modulefile doesn't contain a version
Merge branch 'master' into 1.0.x

Conflicts:
	lib/librarian/puppet/version.rb