add some tests, tweak travis and scrutinizer config
Merge branch 'master' into tests