Revert "Merge pull request #91 from pwestling/versions"

This reverts commit bdc4d44f2f14e4409982f7aba336080528f05224, reversing
changes made to aeba0852a1f5475451d14291388e8345dc0d62e3.
Merge pull request #93 from pwestling/master

Revert "Merge pull request #91 from pwestling/versions"