Tidied Up Version Numbers

Last commit for v2.0.0