Some modernizations and travis tweaks