CS fixes
Added a missing semicolon
Merge pull request #100 from GrahamCampbell/cs

Resolve php-cs issues and added php-cs to travis-ci build
Added test coverage
Merged master changes
Merged with master