don't generate id if defined
Merge branch 'master' of git://github.com/synrc/kvs