Switched from insert-and-never-update to upsert, fixes #47
Merge pull request #48 from adicu/upsert

Switched from insert-and-never-update to upsert, fixes #47