Use standard snapshot versioning

Changing to standard snapshot versioning (x.y-SNAPSHOT) instead
of (x.y.z-SNAPSHOT) means we don't need to update snapshot
branches every time we tag a release.
Merge pull request #197 from richdougherty/snapshot-version

Use standard snapshot versioning