scrutinizer fixes from scrutinizer-ci
Merge pull request #108 from joshuataylor/scrutinzer-fixes

scrutinizer fixes from scrutinizer-ci