Added tests, and fixed up some of the code
Merge branch 'master' into PHPUnit
Added Mockery
Updated to using Mockery Mocks
Added more tests
Completed tests
Merge pull request #30 from cliffordwhansen/PHPUnit

Add unit tests