updated travis yml with script
Merge master