Changed to semantic versioning
tweaked readme versioning
Merge branch 'master' into gh-pages