Merging 1.2
Use a proper version slug so npm doesn't barf :)
Merge version fix