Codestyle, code coverage, scrutinizer
Fix travis
Reduce complexity
Reduce complexity
Update OS X build