Added travis configurations
Fix travis configuration
merging