Misc fixes from live

application/classes/ORM.php

@@ -26,6 +26,8 @@ abstract class ORM extends lnApp_ORM {
 			$this->where($this->_object_name.'.site_id','=',Company::instance()->site());
 
 		// Ensure we Cache our queries
+		// @todo: Disabled as it is not working as expected
+/*
 		$caching = FALSE;
 		foreach ($this->_db_pending as $method)
 			if ($method['name'] == 'cached') {
@@ -35,6 +37,7 @@ abstract class ORM extends lnApp_ORM {
 
 		if (! $caching)
 			$this->cached(Kohana::$config->load('cache.orm.'.$this->_table_name));
+*/
 
 		return parent::_build($type);
 	}