Merge branch 'master' of https://github.com/philsturgeon/codeigniter-restserver