Added methods and tests to the ORM.  Large merge.
added orm.rb changes