Test for minimal_days_in_first_week reader
Use logical operators rather than if/else in Travis CI commands

This reverts 680cd18bcb5500efdc45f83f87dfbce03638b512