Readjust versioning to match develop branch
Merge pull request #182 from washingtonstateuniversity/post-ship-versioning

[PR] Readjust versioning to match develop branch