Quick adaptation for Kohana 3.3

I pushed modifications required to work with Kohana 3.3. I also made a new branch called 3.3/master to highlight it is Kohana 3.3 related code :)