Tweaking setup and fixing a travis issue.