Fixing various version numbers

We have 1.0.4 and 2.0 version numbers floating around - need to clean up.