update for terms and uuid, fall out of (bug 944548)
Merge pull request #180 from andymckay/uuid-uid

update for terms and uuid, fall out of (bug 944548)