Upgrade evil and remove workaround