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