Updated Travis-CI configuration file
Merge branch 'travis-config'