Handle tags with "-" in it more gracefully

otherwise tags like 2013.2-1 become 2013-21.