Correct travis conf file
Merge branch 'hotfix/Travis_conf'