Default push to simple and killed off a couple aliases (ref zprezto).