Merged in updates from the philsturgeon/codeigniter-restserver
repository.