Added more detailed exception classes
Renamed a few exception classes, and added unit tests.
Fix the code to be PSR-2 compliant
Merged in the psr2 compliant code
checked that all src files are PSR-2 compliant
Fixed lost changes due to incorrectly merging branches.
Fixed lost changes due to incorrectly merging branches.
phpunit settings