Minor fixes
Merge branch 'master' of github.com:Stolz/CodeIgniter
Changes from upstream
Changes from upstream
Changes from upstream
Changes from upstream
Changes from upstream
Merge branch 'oauth'
Merge branch 'rest'
Merge branch 'rickshaw'