Merge pull request #312 from shadlaws/kohana_3

Auth-related updates and misc.