Move Up
Begin Blocking Out Tests
Merge branch 'master' into feature/add-xml-raw-and-json-output

Conflicts:
	tests/ProgrammesPlant.test.php
Permit multiple types back from the API
Inline documentation for new methods
Pin down to a specfic PHPUnit version
Merge pull request #10 from unikent/feature/add-xml-raw-and-json-output

Add JSON Options