Merge pull request #40 from fommil/master

more snapshot versioning
hopefully fixes a horrid and subtle concurrency bug