Update to CodeIgniter 2 (thanks, Stefan!)
Merge branch 'ucsf/develop' of github.com:Trott/mwf into ucsf/develop
Merge branch 'ucsf/develop' into ucsf/master
Merge branch 'ucsf/master' of github.com:Trott/mwf into ucsf/master