Use a librarian-puppet friendly version string

librarian-puppet uses rubygems code under the hood, which expects version
strings to not contain '-'.
Merge branch 'librarian-friendly' into movealong