tidied up travis integration code