PSR-2 update
Merge pull request #4 from garoevans/feature/psr-2

PSR-2 update
Include phpunit locally
Add new versions of php to test
Merge pull request #5 from garoevans/feature/tests-update

Feature/tests update