Merge pull request #1 from jgoleary/master

Make duplicate_keys error message more specific