Fix travis deployment condition
Handle a couple of more ES corner cases