fixed travis.yml
merged tidied travis from travis branch