adding travis yml file back in, and adding branch whitelist