changing ORM (object row mapper) to Object Mapper, to avoid any confusion regarding support for object relationships
Merge branch 'master' of github.com:bdeggleston/cqlengine
Merge branch 'master' into ttl