Kohana 33 updates

Some updates to Entity (though they may not be applicable in this repo)
Changing Orm to ORM to make Kohana 3.3 happy