adding travis settings
Merge branch 'travisCI'