get rid of _id
Merge branch 'master' into biggs
gor rid of _id