Tidied up Travis script