Merge branch 'develop'

Merge in PHPUnit dev dependency
Merge branch 'hotfix/23'

Close #23
Fix badge link for TravisCI
Merge branch 'hotfix/readme' into develop

Fix TravisCI badge