Initial trait work
Merge branch 'refs/heads/master' into trait
Traits rock, use blueprints
Add back in deprecated ORM_Kohana driver
Merge branch 'refs/heads/trait'