Updating ES to latest version

@andyleclair Round 2